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

aad76d92 · Torkel Ödegaard · 90880231 · ad1d7f0f · aad76d92 · aad76d92
Commit aad76d92 authored Jul 06, 2016 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CHANGELOG.md
+1 -1

package.json
+1 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
-# 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"