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

This commit is contained in:
danielvincent 2010-08-23 15:55:37 -07:00
commit 18a77c8381

View file

@ -26,7 +26,7 @@ gem 'json'
#Standards
gem 'pubsubhubbub'
gem 'redfinger'
gem 'redfinger', :git => 'git://github.com/rsofaer/redfinger.git'
#EventMachine
gem 'em-http-request',:git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'