Merge branch 'master' of git@github.com:fred-o/oh-my-zsh

Conflicts:

	.gitignore
This commit is contained in:
Fredrik Appelberg committed 2011-12-08 10:02:17 +01:00
commit e24230cbfb
3 files changed
+62 -1

No files matched your search

+2 -1
View File
@@ -4,5 +4,6 @@ projects.zsh
custom/*
!custom/example
!custom/example.zsh
cache
*.swp
!custom/example.zshcache
cache/