Merge branch 'persona-integration' of git://github.com/callahad/discourse

This commit is contained in:
Robin Ward
2013-03-04 11:51:26 -05:00
13 changed files with 108 additions and 1 deletions

View File

@@ -36,6 +36,7 @@ gem "openid-redis-store"
gem "omniauth-facebook"
gem "omniauth-twitter"
gem "omniauth-github"
gem "omniauth-browserid", :git => "git://github.com/callahad/omniauth-browserid.git", :branch => "observer_api"
gem 'oj'
gem 'pbkdf2'
gem 'pg'