Skip to content

Commit

Permalink
Merge branch 'master' of github.com:rvm/rvm2-shell
Browse files Browse the repository at this point in the history 
Conflicts:
	test/integration/base_command_local_test.rb
  • Loading branch information
@mpapis
mpapis committed Oct 14, 2013
2 parents a98da3b + f0b4def commit 60af3e8
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 60af3e8

Please sign in to comment.