linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2013-09-24 14:30:27 +02:00
commit bd32698531
15 changed files with 119 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,6 +1,9 @@
locals.zsh
log/.zsh_history
projects.zsh
custom/*
!custom/example
!custom/example.zsh
*.swp
*.un~
cache/