Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into sinatra

Conflicts:
	lib/gem_template/gems.rb
  • Loading branch information...
commit c34c2f354a197f18904dd65284cca7af22e1e0dd 2 parents cdd4971 + 2598f8b
Winton Welsh authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/gem_template/gems.rb
2  lib/gem_template/gems.rb
View
@@ -13,7 +13,7 @@ class Gems
:'rack-flash' => '=0.1.1',
:'rack-test' => '=0.5.3',
:rake => '=0.8.7',
- :rspec => '=1.3.0',
+ :rspec => '=1.3.1',
:sinatra => '=1.0'
}
Please sign in to comment.
Something went wrong with that request. Please try again.