Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
Raphael 2010-10-04 14:47:40 -04:00
commit e60585862a

View file

@ -1,7 +1,7 @@
source 'http://rubygems.org'
gem 'rails', '3.0.0'
gem 'bundler', '1.0.0'
gem 'bundler', '>= 1.0.0'
#Security
gem 'devise', :git => 'http://github.com/BadMinus/devise.git'