Merge branch 'develop' into feature/stream

Conflicts: controllers/FrontController.php
2016-04-10 21:45:19 +02:00 · 2016-04-10 21:45:19 +02:00 · 8eb0561f36
commit 8eb0561f36
parent ababc2c08d ed7018c957
1 changed files with 3 additions and 3 deletions
--- a/package.json
+++ b/package.json
@ -3,14 +3,14 @@
    "version": "0.4.5",
    "license": "GPL-3.0",
    "dependencies": {
-        "grunt": "~0.4.5",
-        "grunt-cli": "~1.1.0",
+        "grunt": "~1.0.1",
+        "grunt-cli": "~1.2.0",
        "grunt-contrib-cssmin": "~1.0.0",
        "grunt-contrib-uglify": "~1.0.0",
        "grunt-contrib-watch": "~1.0.0",
        "grunt-phpcs": "~0.4.0",
        "grunt-phpunit": "~0.3.6",
-        "grunt-contrib-compress": "~1.1.1",
+        "grunt-contrib-compress": "~1.2.0",
        "bower": "~1.7.1"
    },
    "repository": {