Merge '2.3'

2016-07-17 16:42:27 +01:00
parent 4703aeadb2 dd1a14a438
commit 5b72f2febc
3 changed files with 11 additions and 10 deletions
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,7 @@
        "mccool/laravel-auto-presenter": "^4.3",
        "pragmarx/google2fa": "^0.7.1",
        "rcrowe/twigbridge": "^0.9.2",
-        "roumen/feed": "^2.10.3"
+        "roumen/feed": "^2.10.4"
    },
    "require-dev": {
        "alt-three/testbench": "^1.4",