Kane York 390af7118a Merge branch 'master' into signup-cta ... Conflicts: app/assets/javascripts/discourse/templates/topic.hbs		2015-09-16 10:06:47 -07:00
..
assets	Merge branch 'master' into signup-cta	2015-09-16 10:06:47 -07:00
controllers	FIX: return 422 if the invite is already redeemed	2015-09-16 17:30:00 +05:30
helpers	FIX: Strip lightbox metadata from embedding comments	2015-08-21 15:22:50 -04:00
jobs	FEATURE: export dashboard reports to csv file	2015-09-15 16:45:10 -04:00
mailers	Remove hard-coded fallback to English locale	2015-09-06 21:24:38 +02:00
models	FIX: return 422 if the invite is already redeemed	2015-09-16 17:30:00 +05:30
serializers	Merge pull request #3749 from riking/patch-1	2015-09-11 12:22:58 -04:00
services	FIX: send new email activation token if the original token expired	2015-08-24 12:00:00 +05:30
views	FIX: show category links if category has sub-categories in nojs view	2015-09-13 01:02:00 +05:30