Merge branch '1.2'

Conflicts: composer.lock
2015-09-04 15:09:01 +01:00
parent fa1a5fff0e 2311d67624
commit 4f05f910e9
2 changed files with 7 additions and 7 deletions
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
    ],
    "require": {
        "php": "^5.5.9",
-        "laravel/framework": "5.1.12",
+        "laravel/framework": "~5.1.16",
        "alt-three/emoji": "^1.2",
        "alt-three/validator": "^1.2",
        "barryvdh/laravel-cors": "^0.5",