Conflicts:
	README.textile
	tools/install.sh
This commit is contained in:
Yin Hou 2015-03-07 15:51:40 +08:00
commit 915bb60eaa
167 changed files with 3916 additions and 855 deletions

View file

@ -55,13 +55,13 @@ alias run_parallel='rake db:migrate test:prepare; RAILS_ENV=test rake parallel:p
# Example format: plugins=(rails git textmate ruby lighthouse)
plugins=(textmate git ruby rails3 rvm github)
source $ZSH/oh-my-zsh.sh
# User configuration
export PATH=$HOME/bin:/usr/local/bin:$PATH
# export MANPATH="/usr/local/man:$MANPATH"
source $ZSH/oh-my-zsh.sh
# You may need to manually set your language environment
# export LANG=en_US.UTF-8