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

2017-09-28 10:37:57 +02:00
parent 18337f610d 0e5e2f3fb9
commit 5849fbf04e
145 changed files with 676 additions and 42551 deletions
@@ -64,6 +64,13 @@
  "dependencies": {
    "@types/enzyme": "^2.8.8",
    "ace-builds": "^1.2.8",
+    "angular": "^1.6.6",
+    "angular-bindonce": "^0.3.1",
+    "angular-mocks": "^1.6.6",
+    "angular-native-dragdrop": "^1.2.2",
+    "angular-route": "^1.6.6",
+    "angular-sanitize": "^1.6.6",
+    "clipboard": "^1.7.1",
    "eventemitter3": "^2.0.2",
    "gaze": "^1.1.2",
    "gridstack": "https://github.com/grafana/gridstack.js#grafana",