Merge branch '2.2' into 2.3

# Conflicts: # composer.lock
2016-04-27 14:58:20 +01:00
parent 28e7af7107 65ebfde315
commit df373e93ef
8 changed files with 124 additions and 96 deletions
@@ -20,7 +20,7 @@
    ],
    "require": {
        "php": ">=5.5.9",
-        "laravel/framework": "~5.2.30",
+        "laravel/framework": "~5.2.31",
        "alt-three/badger": "^3.0",
        "alt-three/bus": "^1.0",
        "alt-three/emoji": "^3.0",