Commit graph

3 commits

Author SHA1 Message Date
Sorin Ionescu
f5c761c278 Cleaned up the plugins. 2011-09-14 01:35:51 -04:00
Sorin Ionescu
eccb24572d Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Conflicts:
	.gitignore
	lib/aliases.zsh
	lib/completion.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/key-bindings.zsh
	lib/misc.zsh
	lib/spectrum.zsh
	plugins/git/git.plugin.zsh
	plugins/osx/_man-preview
	plugins/osx/osx.plugin.zsh
	plugins/svn/svn.plugin.zsh
	templates/zshrc.zsh-template
	themes/lukerandall.zsh-theme
	themes/philips.zsh-theme
	tools/upgrade.sh
2011-09-14 01:35:50 -04:00
Myron Marston
6b610d7dd8 Add bundler plugin with aliases. 2011-02-15 11:27:25 -08:00