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

9 years ago · aad76d9220
parent 9088023116 ad1d7f0ffb
commit aad76d9220
2 changed files with 2 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,4 @@
-# 3.2.0-pre (unreleased)
+# 4.0-pre (unreleased)

 ### Enhancements
 * **Login**: Adds option to disable username/password logins, closes [#4674](https://github.com/grafana/grafana/issues/4674)
--- a/package.json
+++ b/package.json
@ -4,7 +4,7 @@
    "company": "Coding Instinct AB"
  },
  "name": "grafana",
-  "version": "3.2.0-pre1",
+  "version": "4.0.0-pre1",
  "repository": {
    "type": "git",
    "url": "http://github.com/grafana/grafana.git"