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

@@ -5,6 +5,16 @@ GIT
rack-mini-profiler (0.1.23)
rack (>= 1.1.3)
GIT
remote: git://github.com/callahad/omniauth-browserid.git
revision: af62d667626c1622de6fe13b60849c3640765ab1
branch: observer_api
specs:
omniauth-browserid (0.0.2)
faraday
multi_json
omniauth (~> 1.0)
GIT
remote: git://github.com/emberjs/ember-rails.git
revision: 57bbe3202725e55a8e4eaccba83d663b26bcf024
@@ -490,6 +500,7 @@ DEPENDENCIES
nokogiri
oj
omniauth
omniauth-browserid!
omniauth-facebook
omniauth-github
omniauth-openid