sync with oss master

This commit is contained in:
Torkel Ödegaard
2014-11-28 09:14:54 +01:00
parent e5eb0e3874
commit 634d8c9978
+2
View File
@@ -9,6 +9,7 @@ define([
'config',
'bootstrap',
'angular-route',
'angular-sanitize',
'angular-strap',
'angular-dragdrop',
'extend-jquery',
@@ -60,6 +61,7 @@ function (angular, $, _, appLevelRequire, config) {
var apps_deps = [
'ngRoute',
'ngSanitize',
'$strap.directives',
'ang-drag-drop',
'grafana',