Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse

This commit is contained in:
maxwell 2010-06-22 10:33:45 -07:00
commit 0ef2214526

View file

@ -34,3 +34,6 @@ group :development do
gem "nifty-generators" gem "nifty-generators"
end end
group :deployment do
gem 'sprinkle', :git => "git://github.com/rsofaer/sprinkle.git"
end