Merge branch '2.0'

2015-12-02 22:22:41 +00:00
parent f3fec2c58c ff91bc4de3
commit 30943eb331
2 changed files with 42 additions and 42 deletions
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
    ],
    "require": {
        "php": ">=5.5.9",
-        "laravel/framework": "~5.1.24",
+        "laravel/framework": "~5.1.26",
        "alt-three/emoji": "^2.1",
        "alt-three/validator": "^1.4",
        "barryvdh/laravel-cors": "^0.7",