Patrick O'Carroll 780d3e2c8f fix for merge conflict		2017-12-14 15:50:47 +01:00
..
app	fix for merge conflict	2017-12-14 15:50:47 +01:00
dashboards	Merge branch 'master' into develop	2017-11-17 15:49:17 +01:00
emails	include error message in email notification (#8392)	2017-05-17 09:51:51 +02:00
fonts	ux: testing roboto font	2017-08-14 13:57:16 +02:00
img	Merge branch 'develop' into 9879-login	2017-12-13 09:22:48 +01:00
sass	replaced old table with filter-table, removed edit button, made whole rows to links	2017-12-14 14:30:13 +01:00
test	Merge branch 'develop' into develop-search	2017-11-17 16:37:09 +01:00
vendor	Merge branch 'master' into develop	2017-10-26 15:59:50 +02:00
views	removed row to center footer (#10115)	2017-12-07 14:07:16 +01:00
robots.txt	add support for robots.txt file	2015-06-15 19:02:38 -04:00