Kane York a5f906db69 Merge branch 'master' into category-reorder		2015-09-13 19:07:36 -07:00
..
assets	Merge branch 'master' into category-reorder	2015-09-13 19:07:36 -07:00
controllers	FEATURE: Whisper posts	2015-09-11 14:05:21 -04:00
helpers	FIX: Strip lightbox metadata from embedding comments	2015-08-21 15:22:50 -04:00
jobs	FEATURE: implement capping of new/unread	2015-09-07 12:03:17 +10:00
mailers	Remove hard-coded fallback to English locale	2015-09-06 21:24:38 +02:00
models	FIX: ensure letter avatar service uses same algorithm	2015-09-14 09:42:21 +10:00
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