Annabel Dunstone 3cfeb37558 Merge conflict fixes		2016-04-07 15:33:18 -07:00
..
assets	Merge conflict fixes	2016-04-07 15:33:18 -07:00
controllers	Merge branch 'issue_14012' into 'master'	2016-04-07 15:19:56 +00:00
finders	Standardised the output of the JSON to always include the name	2016-03-29 11:59:13 +01:00
helpers	Update diff colors and icons	2016-04-07 15:33:18 -07:00
mailers	Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature	2016-03-25 13:05:15 +01:00
models	Expire caches after project creation to ensure a consistent state	2016-04-07 00:29:01 -07:00
services	Merge branch 'issue_14012' into 'master'	2016-04-07 15:19:56 +00:00
uploaders	Remove reduntant `move_to_store` override	2016-03-30 12:50:19 +02:00
validators	Allow webhooks URL to have leading and trailing spaces	2016-02-26 14:34:06 -05:00
views	Update diff colors and icons	2016-04-07 15:33:18 -07:00
workers	Exclude projects pending deletion from all results	2016-03-31 20:20:18 +02:00