Brentley Jones 5e08427dd3 Merge branch 'master' into fixed_modals ... Conflicts: app/assets/javascripts/discourse/templates/modal/modal.js.handlebars app/assets/stylesheets/application/modal.css.scss		2013-07-16 18:58:49 +00:00
..
assets	Merge branch 'master' into fixed_modals	2013-07-16 18:58:49 +00:00
controllers	allow login required screen to be customized	2013-07-16 20:49:04 +10:00
helpers	Fix recommendations from #1145	2013-07-05 15:59:39 +04:00
mailers	Private messages have instructions for reply by email. We also strip X-Discourse headers	2013-06-25 11:35:26 -04:00
models	Merge pull request #1195 from initforthe/post-analyser-backtrace-fix	2013-07-16 07:34:54 -07:00
serializers	Finalize read only and post only categories, finished off UI work	2013-07-16 15:46:11 +10:00
services	Refactor code that raises deprecating warnings in Rails 4	2013-07-08 18:35:11 +02:00
views	hmm I totally missed that it was already there	2013-07-16 21:06:04 +10:00