Connor Shea 2df34c20cb Fix a lingering conflict.		2016-08-17 12:29:05 -06:00
..
assets	Fix more incomplete if/else statements.	2016-08-17 12:18:53 -06:00
controllers	Merge branch 'master' into diff-line-comment-vuejs	2016-08-17 12:10:09 -06:00
finders	Move to project dropdown with infinite scroll for better performance	2016-08-17 07:33:51 +02:00
helpers	Merge branch 'master' into diff-line-comment-vuejs	2016-08-17 12:10:09 -06:00
mailers	Send notification email when all discussions are resolved	2016-07-28 21:00:32 -06:00
models	Fix a lingering conflict.	2016-08-17 12:29:05 -06:00
services	Merge branch 'master' into diff-line-comment-vuejs	2016-08-17 12:10:09 -06:00
uploaders	Remove magic comments from Ruby files (!5456)	2016-07-24 07:08:45 +02:00
validators	…
views	Merge branch 'master' into diff-line-comment-vuejs	2016-08-17 12:10:09 -06:00
workers	Tracking of custom events	2016-08-17 10:04:04 +02:00