Torkel Ödegaard 9f29c54170 Merge branch 'query_part_refactor' into alerting ... Conflicts: pkg/services/sqlstore/migrations/alert_mig.go pkg/services/sqlstore/migrations/heartbeat_mig.go		2016-08-15 17:54:42 +02:00
..
app	Merge branch 'query_part_refactor' into alerting	2016-08-15 17:54:42 +02:00
dashboards	feat(export): export dashboard modal	2016-05-17 11:17:11 +02:00
emails	feat(alerting): list all series in alert email	2016-08-13 12:50:51 +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(query parts): refactoring query part component to support actions	2016-08-15 13:51:55 +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