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

[github/wallabag/wallabag.git] / composer.json

diff --git a/composer.json b/composer.json
index 79de337bada8f38cbd5a9e69c393f5be993a0bfc..ebc0a7dc555de13f281d62a4ba23b4760adaa777 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -54,11 +54,11 @@
         "sensio/framework-extra-bundle": "^3.0.2",
         "incenteev/composer-parameter-handler": "^2.0",
         "nelmio/cors-bundle": "~1.4.0",
-        "friendsofsymfony/rest-bundle": "~1.4",
-        "jms/serializer-bundle": "~1.0",
+        "friendsofsymfony/rest-bundle": "~2.1",
+        "jms/serializer-bundle": "~1.1",
         "nelmio/api-doc-bundle": "~2.7",
         "mgargano/simplehtmldom": "~1.5",
-        "tecnickcom/tcpdf": "~6.2",
+        "tecnickcom/tc-lib-pdf": "dev-master",
         "simplepie/simplepie": "~1.3.1",
         "willdurand/hateoas-bundle": "~1.0",
         "htmlawed/htmlawed": "~1.1.19",