Merge remote-tracking branch 'origin'

# Conflicts:
#	README.md
#	plugins/git/git.plugin.zsh
This commit is contained in:
Yin Hou 2016-05-26 17:24:58 +08:00
commit dae089c3c6
280 changed files with 15578 additions and 3030 deletions

View file

@ -19,6 +19,10 @@ alias run_parallel='rake db:migrate test:prepare; RAILS_ENV=test rake parallel:p
# Uncomment the following line to use case-sensitive completion.
# CASE_SENSITIVE="true"
# Uncomment the following line to use hyphen-insensitive completion. Case
# sensitive completion must be off. _ and - will be interchangeable.
# HYPHEN_INSENSITIVE="true"
# Uncomment the following line to disable bi-weekly auto-update checks.
# DISABLE_AUTO_UPDATE="true"