Merge branch 'v2' into patch-1

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

diff --git a/composer.json b/composer.json
index 78b32307acb284d58132b80420f782aac9468300..497b80121dbee95bfdca9ee352b7adc91b785a52 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -54,15 +54,17 @@
         "pagerfanta/pagerfanta": "~1.0.3",
         "lexik/form-filter-bundle": "~5.0",
         "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "dev-master",
-        "friendsofsymfony/oauth-server-bundle": "^1.5@dev",
+        "friendsofsymfony/user-bundle": "~2.0@dev",
+        "friendsofsymfony/oauth-server-bundle": "^1.5",
         "stof/doctrine-extensions-bundle": "^1.2@dev",
         "scheb/two-factor-bundle": "~2.0",
         "grandt/phpepub": "~4.0",
         "wallabag/php-mobi": "~1.0.0",
         "kphoen/rulerz-bundle": "~0.10",
         "guzzlehttp/guzzle": "^5.2.0",
-        "doctrine/doctrine-migrations-bundle": "^1.0"
+        "doctrine/doctrine-migrations-bundle": "^1.0",
+        "paragonie/random_compat": "~1.0",
+        "craue/config-bundle": "~1.4"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",