Merge branch 'develop' into feature/update-toolchain

Conflicts: VERSION
2015-01-18 16:52:55 +01:00 · 2015-01-18 16:52:55 +01:00 · 9218b331f9
commit 9218b331f9
parent 0c7aebc200 c1a17a315d
3 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-7.0.0-next
+8.0.0-dev.0
--- a/bower.json
+++ b/bower.json
@ -1,6 +1,6 @@
 {
    "name": "uhr",
-    "version": "7.0.0-next",
+    "version": "8.0.0-dev.0",
    "dependencies": {
        "jquery": "~2.1.3",
        "jquery-ui": "~1.11.2",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "uhr",
-  "version": "7.0.0-next",
+  "version": "8.0.0-dev.0",
  "description": "jQuery QLOCKTWO plugin",
  "keywords": [
    "jquery-plugin",