ilgizar 9d7ab78d9f Resolved conflict		2018-03-14 23:39:05 +05:00
..
app	Resolved conflict	2018-03-14 23:39:05 +05: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	Light theme icon color (#10730)	2018-02-02 10:18:45 +01:00
sass	sass/base: import from current dir in _fonts.scss (#10894)	2018-02-13 17:20:51 +01:00
test	folders: changes needed due to merge	2018-02-01 13:21:24 +01:00
vendor	Corrected work for graphs created before this feature.	2018-03-12 23:43:13 +05:00
views	build: fixed recovery test	2018-02-06 13:16:21 +01:00
robots.txt	add support for robots.txt file	2015-06-15 19:02:38 -04:00