Commit 0ef22145 authored by maxwell's avatar maxwell

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

parents cf80aa40 81f5ca7e
......@@ -34,3 +34,6 @@ group :development do
gem "nifty-generators"
end
group :deployment do
gem 'sprinkle', :git => "git://github.com/rsofaer/sprinkle.git"
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment