Torkel Ödegaard 05697d5ecd Merge branch 'master' into alerting ... Conflicts: conf/sample.ini		2016-08-17 10:03:33 +02:00
..
app	Merge branch 'master' into alerting	2016-08-17 10:03:33 +02:00
dashboards	feat(export): export dashboard modal	2016-05-17 11:17:11 +02:00
emails	fix(alerting): rename events to evalMatches	2016-08-15 20:17:32 +02:00
fonts	old grafana wordmark was still showing on login and sidebar (#4972)	2016-05-11 09:08:25 +02:00
img	feat(thresholds): updated design for grab handles	2016-08-11 21:22:40 +02:00
sass	feat(alerting): changed fontsize in alert list	2016-08-16 21:26:54 +02:00
test	Merge branch 'master' into alerting	2016-08-15 07:58:30 +02:00
vendor	Merge branch 'master' into alerting	2016-07-27 09:45:16 +02:00
views	Merge branch 'v3.1.x'	2016-08-01 12:23:36 +02:00
robots.txt	add support for robots.txt file	2015-06-15 19:02:38 -04:00