5 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	615b692442	feat(apps): fixed unit tests	2016-07-08 18:21:25 +02:00
bergquist	8b2f6fffc9	test(dashboards): comment code in broken tests	2016-06-17 07:43:57 +02:00
Torkel Ödegaard	3fb0b71822	refactor(): refactoring json usage	2016-03-12 00:13:06 +01:00
Torkel Ödegaard	ece8a925a6	Merge branch 'master' of github.com:grafana/grafana ... Conflicts: examples/nginx-app/package.json examples/nginx-app/plugin.json	2016-03-11 12:39:10 +01:00
Torkel Ödegaard	60adcedebe	feat(plugins): worked on plugin dashboard import handling	2016-03-10 19:57:48 +01:00