barthc 4f8915497d Merge branch 'master' into fix-double-query-string-url		2016-06-17 17:52:17 +01:00
..
assets	Merge branch 'contrib-calendar-colors' into 'master'	2016-06-17 16:07:41 +00:00
controllers	Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master'	2016-06-17 15:41:59 +00:00
finders	Revert "squashed merge and fixed conflicts"	2016-06-16 12:59:07 +02:00
helpers	Merge branch 'template_dropdown' into 'master'	2016-06-16 17:29:45 +00:00
mailers	fixed merge conflicts on UI branch	2016-06-16 15:01:27 +02:00
models	Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master'	2016-06-17 15:41:59 +00:00
services	Merge branch 'feature/project-export' into 'master'	2016-06-17 15:35:27 +00:00
uploaders	…
validators	…
views	Merge branch 'master' into fix-double-query-string-url	2016-06-17 17:52:17 +01:00
workers	fixed merge conflicts on UI branch	2016-06-16 15:01:27 +02:00