Merge branch '2.1'

2016-02-17 20:08:56 +00:00
parent 73fa0951f7 1ddd868449
commit 726f5e851d
6 changed files with 17 additions and 14 deletions
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
    ],
    "require": {
        "php": ">=5.5.9",
-        "laravel/framework": "5.2.14",
+        "laravel/framework": "~5.2.19",
        "alt-three/bus": "^1.0",
        "alt-three/emoji": "^3.0",
        "alt-three/validator": "^1.4",