diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-21 15:12:11 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-22 21:25:05 +0100 |
commit | 5066c3e066ad67788bdf6edac9e80cab614a2d4d (patch) | |
tree | a3e7394f4ff77bc628625dda887286afb9dcf0df /composer.json | |
parent | 4da598c5df08f8a5e20c838df5de8c9e4efcb273 (diff) | |
download | wallabag-5066c3e066ad67788bdf6edac9e80cab614a2d4d.tar.gz wallabag-5066c3e066ad67788bdf6edac9e80cab614a2d4d.tar.zst wallabag-5066c3e066ad67788bdf6edac9e80cab614a2d4d.zip |
Re-use FOSUser master branch
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index e2aeb424..52e3235f 100644 --- a/composer.json +++ b/composer.json | |||
@@ -65,7 +65,7 @@ | |||
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": "dev-master#e168ed64629d034cb9cbbffb9d4350f62ef04fab as 2.0.x-dev", | 68 | "friendsofsymfony/user-bundle": "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", | 70 | "stof/doctrine-extensions-bundle": "^1.2", |
71 | "scheb/two-factor-bundle": "~2.0", | 71 | "scheb/two-factor-bundle": "~2.0", |