Merge branch '1.7.x'

Conflicts: src/css/bootstrap.dark.min.css src/css/bootstrap.light.min.css src/css/default.min.css
2014-08-11 13:35:15 +02:00
parent aa03de8e52 577efbf0c2
commit 3d9a4dcbf3
14 changed files with 80 additions and 50 deletions
@@ -4,7 +4,7 @@
    "company": "Coding Instinct AB"
  },
  "name": "grafana",
-  "version": "1.7.0-rc1",
+  "version": "1.7.0",
  "repository": {
    "type": "git",
    "url": "http://github.com/torkelo/grafana.git"