David Taylor c4ff66e1a5 DEV: Correct merge conflicts for 9cfe3f99		2019-07-24 13:31:16 +01:00
..
assets	DEV: Correct merge conflicts for 9cfe3f99	2019-07-24 13:31:16 +01:00
controllers	SECURITY: Add confirmation screen when connecting associated accounts	2019-07-24 13:29:59 +01:00
helpers	replace subfolder on cdn url conversion between general cdn and s3 (#7764)	2019-06-17 11:51:17 -07:00
jobs	FIX: Don't send notification email when user isn't allowed to see topic	2019-07-02 09:05:36 +10:00
mailers	SECURITY: Strip HTML from invite emails	2019-07-05 14:58:46 -04:00
models	SECURITY: SQL injection with default categories	2019-07-11 13:53:12 -04:00
serializers	FIX: In reply to would sometimes have a broken link	2019-06-10 11:33:10 -04:00
services	FIX: iterate when clearing watched words cache	2019-07-04 08:59:01 -07:00
views	SECURITY: Add confirmation screen when logging in via email link	2019-06-17 18:20:48 +01:00