Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard
2016-03-30 00:16:15 +02:00
@@ -10,6 +10,7 @@ export class DashImportListCtrl {
plugin: any;
datasource: any;
/** @ngInject */
constructor($scope, private $http, private backendSrv, private $rootScope) {
this.dashboards = [];