Merge branch 'master' into gridstack

2017-08-04 13:09:26 +02:00
parent de7bb8cb62 c7ca4830a8
commit a0a2eda5c6
262 changed files with 12156 additions and 2055 deletions
@@ -4,7 +4,7 @@
    "company": "Coding Instinct AB"
  },
  "name": "grafana",
-  "version": "4.4.0-pre1",
+  "version": "5.0.0-pre1",
  "repository": {
    "type": "git",
    "url": "http://github.com/grafana/grafana.git"
@@ -33,7 +33,7 @@
    "grunt-ng-annotate": "^3.0.0",
    "grunt-notify": "^0.4.5",
    "grunt-postcss": "^0.8.0",
-    "grunt-sass": "^1.2.1",
+    "grunt-sass": "^2.0.0",
    "grunt-string-replace": "~1.3.1",
    "grunt-systemjs-builder": "^0.2.7",
    "grunt-usemin": "3.1.1",