Torkel Ödegaard 7b1d827460 Merge branch 'master' into dashboard-thing ... Conflicts: public/app/features/datasources/partials/edit.html		2016-03-08 15:48:01 +01:00
..
datasource	Merge branch 'master' into dashboard-thing	2016-03-08 15:48:01 +01:00
panel	Merge branch 'master' of github.com:grafana/grafana	2016-03-08 15:32:15 +01:00
plugin_api.md	removed /app route, confusing when some assets use public/app/.. route and some use just app/... all public static assets should no use public route, app route is no more	2016-02-01 18:19:02 +01:00
sdk.ts	feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk	2016-02-10 13:09:39 +01:00