Merge branch '2.1' into merge

# Conflicts: # composer.json # composer.lock
2016-02-20 21:14:25 +00:00
parent 8d1c244e02 0d614fe0c3
commit d096e603d4
178 changed files with 2465 additions and 2497 deletions
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
    ],
    "require": {
        "php": ">=5.5.9",
-        "laravel/framework": "~5.2.19",
+        "laravel/framework": "~5.2.20",
        "alt-three/badger": "^1.0",
        "alt-three/bus": "^1.0",
        "alt-three/emoji": "^3.0",