Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Gaetan Semet 2014-08-11 11:11:24 +02:00
commit ab4149fe7c
2 changed files with 2 additions and 1 deletions

View file

@ -90,6 +90,7 @@ bq. "OH MY ZSHELL!"
h2. Setup h2. Setup
@oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9. @oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9.
If not already, install zsh using the command line first.
h3. The automatic installer... (do you trust me?) h3. The automatic installer... (do you trust me?)

View file

@ -6,7 +6,7 @@ alias gemsets='rvm gemset list'
local ruby18='ruby-1.8.7' local ruby18='ruby-1.8.7'
local ruby19='ruby-1.9.3' local ruby19='ruby-1.9.3'
local ruby20='ruby-2.0.0' local ruby20='ruby-2.0.0'
local ruby21='ruby-2.1.1' local ruby21='ruby-2.1.2'
function rb18 { function rb18 {
if [ -z "$1" ]; then if [ -z "$1" ]; then