Kris Aubuchon 5aaaa9b915 Merge remote-tracking branch 'upstream/master' ... Conflicts: app/assets/stylesheets/desktop/topic-post.scss		2014-07-10 11:45:25 -04:00
..
assets	Merge remote-tracking branch 'upstream/master'	2014-07-10 11:45:25 -04:00
controllers	FIX: allow for subdirectorys for cdn assets	2014-07-10 17:29:38 +10:00
helpers	FIX: disable x accl redirect for CDN assets	2014-07-10 16:32:46 +10:00
jobs	FEATURE: don't demote trust level 3 users who were promoted less than SiteSetting.leader_promotion_min_duration days ago	2014-07-08 17:39:49 -04:00
mailers	Improve invite email copy	2014-07-10 10:57:40 +05:30
models	FIX: there is no trust_level_5	2014-07-10 12:17:13 +10:00
serializers	BUGFIX: incorrect ordering in category permissions	2014-07-10 12:02:16 +10:00
services	FEATURE: Editor badge	2014-07-07 17:55:40 +10:00
views	FIX: disable x accl redirect for CDN assets	2014-07-10 16:32:46 +10:00