Merge remote-tracking branch 'origin/master' into 2.1

2016-07-20 12:02:02 +02:00
parent 2bb138ef6d 317fc6e684
commit 0faeabefa7
26 changed files with 149 additions and 64 deletions
--- a/composer.json
+++ b/composer.json
@ -73,7 +73,7 @@
        "grandt/phpepub": "~4.0",
        "wallabag/php-mobi": "~1.0.0",
        "kphoen/rulerz-bundle": "~0.10",
-        "guzzlehttp/guzzle": "^5.2.0",
+        "guzzlehttp/guzzle": "^5.3.1",
        "doctrine/doctrine-migrations-bundle": "^1.0",
        "paragonie/random_compat": "~1.0",
        "craue/config-bundle": "~1.4",