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
..
assets	Merge branch 'github-auth' of git://github.com/nverba/discourse	2013-02-27 12:09:22 -05:00
controllers	Merge branch 'github-auth' of git://github.com/nverba/discourse	2013-02-27 12:09:22 -05:00
helpers	Merge pull request #153 from xdite/refactor_topic_show_again	2013-02-15 07:19:01 -08:00
mailers	Fix all the trailing whitespace	2013-02-07 16:45:24 +01:00
models	Merge branch 'github-auth' of git://github.com/nverba/discourse	2013-02-27 12:09:22 -05:00
serializers	Show likes even while logged out.	2013-02-27 11:22:03 -05:00
views	Merge pull request #222 from alxndr/rss-for-topics	2013-02-27 08:30:08 -08:00