Skip to content
Commit e24230cb authored by Fredrik Appelberg's avatar Fredrik Appelberg
Browse files

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

Conflicts:

	.gitignore
parents 7c36ef7f 0a896119
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment