Merge branch '2.0'

# Conflicts: # composer.lock
2015-12-15 15:43:37 +00:00
parent 9e11f5eba0 7f02aa2bce
commit 04af799052
2 changed files with 15 additions and 15 deletions
--- a/composer.json
+++ b/composer.json
@@ -32,11 +32,11 @@
        "graham-campbell/throttle": "^5.1",
        "graham-campbell/exceptions": "^7.0",
        "guzzlehttp/guzzle": "^6.1",
-        "jenssegers/date": "^3.0",
+        "jenssegers/date": "^3.1",
        "mccool/laravel-auto-presenter": "^4.2",
        "pragmarx/google2fa": "^0.7",
        "rcrowe/twigbridge": "^0.9",
-        "roumen/feed": "^2.9"
+        "roumen/feed": "^2.9.8"
    },
    "require-dev": {
        "alt-three/testbench": "^1.1",