Merge branch 'develop' into fix/trusted-proxies

sorry
2017-02-01 20:35:10 +01:00 · 2017-02-01 20:35:10 +01:00 · 24650b67be
commit 24650b67be
parent 8ab4faad8a e5ed1c7f6a
341 changed files with 13312 additions and 7936 deletions
--- a/composer.json
+++ b/composer.json
@ -27,7 +27,9 @@
        "dingo/api": "1.0.0-beta6",
        "aws/aws-sdk-php": "3.19.20",
        "predis/predis": "1.1.1",
-        "fideloper/proxy": "3.2.0"
+        "fideloper/proxy": "3.2.0",
+        "laracasts/utilities": "2.1.0",
+        "lord/laroute": "2.3.0"
    },
    "require-dev": {
        "fzaninotto/faker": "~1.4",