Torkel Ödegaard 0ea3458f69 Merge branch 'v3.1.x' ... Conflicts: public/app/features/dashboard/dynamic_dashboard_srv.ts		2016-08-14 14:47:14 +02:00
..
app	Merge branch 'v3.1.x'	2016-08-14 14:47:14 +02:00
dashboards	feat(export): export dashboard modal	2016-05-17 11:17:11 +02:00
emails	feat(signup): progress on new sign up and email verification flow, #2353	2015-08-28 13:45:16 +02:00
fonts	old grafana wordmark was still showing on login and sidebar (#4972)	2016-05-11 09:08:25 +02:00
img	feat(links): updated links to grafana.net	2016-07-11 19:07:16 +02:00
sass	Merge branch 'v3.1.x'	2016-08-10 12:44:43 +02:00
test	Merge branch 'v3.1.x'	2016-08-14 14:47:14 +02:00
vendor	Merge branch 'v3.1.x'	2016-07-23 12:01:27 +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