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

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)

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"