merged master

This commit is contained in:
sfischme 2011-09-23 18:32:12 -04:00
parent 6f8d9ec2ae
commit f91a2867b2
2 changed files with 9 additions and 20 deletions

View file

@ -16,7 +16,6 @@ gem "actionwebservice", :git => "git://github.com/dejan/actionwebservice.git"
gem "rubycas-client", "~>2.2.1"
gem "ruby-openid", :require => "openid"
gem "sqlite3"
gem "ruby-debug"
gem 'bcrypt-ruby', '~> 2.1.4'
gem "webrat", ">=0.7.0", :groups => [:cucumber, :test]