Robin Ward 007118b00c Merge branch 'github-auth' of git://github.com/nverba/discourse ... Conflicts: config/locales/server.en.yml db/structure.sql spec/views/omniauth_callbacks/complete.html.erb_spec.rb		2013-02-27 12:09:22 -05:00
..
omniauth_callbacks	Merge branch 'github-auth' of git://github.com/nverba/discourse	2013-02-27 12:09:22 -05:00