Merge branch '2.0'

# Conflicts: # composer.lock
2015-12-09 14:20:18 +00:00
parent 945f9cdc78 8ca809d5a0
commit e099b45495
2 changed files with 26 additions and 25 deletions
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
        "graham-campbell/core": "^4.2",
        "graham-campbell/markdown": "^5.3",
        "graham-campbell/throttle": "^5.1",
-        "graham-campbell/exceptions": "^6.0",
+        "graham-campbell/exceptions": "^6.1",
        "guzzlehttp/guzzle": "^6.1",
        "jenssegers/date": "^3.0",
        "mccool/laravel-auto-presenter": "^4.2",