Gaetan Semet e357d762b5 Merge remote-tracking branch 'upstream/master' ... # Conflicts: # plugins/npm/npm.plugin.zsh		2018-04-27 12:06:08 +02:00
..
plugins	update subliminal alias	2018-02-04 16:39:14 +01:00
themes	Add exemplary custom theme folder	2018-04-19 21:03:52 +02:00
example.zsh	Reword and clarify example.zsh custom file	2016-05-12 13:59:10 +02:00