Merge branch '2.3'

# Conflicts: # composer.lock
2016-06-11 00:49:49 +01:00
parent e96088fc0f 04215fc37a
commit c25437871a
14 changed files with 211 additions and 75 deletions
--- a/composer.json
+++ b/composer.json
@@ -20,12 +20,13 @@
    ],
    "require": {
        "php": ">=5.5.9",
-        "laravel/framework": "5.2.36",
+        "laravel/framework": "5.2.37",
        "alt-three/badger": "^3.1",
        "alt-three/bus": "^1.1",
        "alt-three/emoji": "^3.1",
        "alt-three/throttle": "^1.0",
        "alt-three/validator": "^1.5",
+        "aws/aws-sdk-php": "^3.7",
        "backup-manager/laravel": "^1.1",
        "barryvdh/laravel-cors": "^0.8",
        "doctrine/dbal": "^2.5",