Merge branch '2.3' into 2.4

2016-07-18 19:38:10 +01:00
parent bcbbee22d9 f8505a866d
commit 0d90f0459b
2 changed files with 25 additions and 25 deletions
@@ -36,7 +36,7 @@
        "graham-campbell/core": "^5.1",
        "graham-campbell/exceptions": "^8.6",
        "graham-campbell/markdown": "^6.1",
-        "guzzlehttp/guzzle": "^6.2",
+        "guzzlehttp/guzzle": "^6.2.1",
        "jenssegers/date": "^3.2",
        "mccool/laravel-auto-presenter": "^4.3",
        "pragmarx/google2fa": "^0.7.1",