Johannes Schill 79bad41843 fix: Remove conflict file #10289		2018-01-10 12:00:28 +01:00
..
app	fix: Remove conflict file #10289	2018-01-10 12:00:28 +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	Delete CopyQuery.png	2018-01-09 12:50:59 +01:00
sass	fix: Clean up logging and remove unused css #10289	2018-01-09 14:42:23 +01:00
test	tech: enzyme container test working	2018-01-01 18:54:23 +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