Commit graph

3 commits

Author SHA1 Message Date
Yin Hou
dae089c3c6 Merge remote-tracking branch 'origin'
# Conflicts:
#	README.md
#	plugins/git/git.plugin.zsh
2016-05-26 17:24:58 +08:00
Marc Cornellà
2198ff05e3 Rename license to LICENSE.txt for consistency 2016-05-12 13:52:34 +02:00
Marc Cornellà
26a07b0ad8 Rename README.markdown to README.md for consistency 2016-05-12 13:51:19 +02:00
Renamed from README.markdown (Browse further)