diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-11 19:32:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-11 19:32:22 +0200 |
commit | dbe94e73a9eaf3acb250812913b0303b35d01a2e (patch) | |
tree | 59c04b4836def3628c508c4d15e5ec45f4c05315 /composer.json | |
parent | 9bed0ea23672eaf72c3a7d9107e7d1fd4fe8fdf0 (diff) | |
parent | a0a4ce3135565d5d0e362da044e17ce8052bb272 (diff) | |
download | wallabag-dbe94e73a9eaf3acb250812913b0303b35d01a2e.tar.gz wallabag-dbe94e73a9eaf3acb250812913b0303b35d01a2e.tar.zst wallabag-dbe94e73a9eaf3acb250812913b0303b35d01a2e.zip |
Merge pull request #2429 from wallabag/lock-fos-user
Lock deps for FOSUser
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/composer.json b/composer.json index 4f56162e..79de337b 100644 --- a/composer.json +++ b/composer.json | |||
@@ -65,9 +65,9 @@ | |||
65 | "liip/theme-bundle": "~1.1", | 65 | "liip/theme-bundle": "~1.1", |
66 | "lexik/form-filter-bundle": "~5.0", | 66 | "lexik/form-filter-bundle": "~5.0", |
67 | "j0k3r/graby": "~1.0", | 67 | "j0k3r/graby": "~1.0", |
68 | "friendsofsymfony/user-bundle": "~2.0@dev", | 68 | "friendsofsymfony/user-bundle": "dev-master#e168ed64629d034cb9cbbffb9d4350f62ef04fab as 2.0.x-dev", |
69 | "friendsofsymfony/oauth-server-bundle": "^1.5", | 69 | "friendsofsymfony/oauth-server-bundle": "^1.5", |
70 | "stof/doctrine-extensions-bundle": "^1.2@dev", | 70 | "stof/doctrine-extensions-bundle": "^1.2", |
71 | "scheb/two-factor-bundle": "~2.0", | 71 | "scheb/two-factor-bundle": "~2.0", |
72 | "grandt/phpepub": "~4.0", | 72 | "grandt/phpepub": "~4.0", |
73 | "wallabag/php-mobi": "~1.0.0", | 73 | "wallabag/php-mobi": "~1.0.0", |