diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-10-06 09:19:06 +0200 |
commit | 16dabc326311f084d671be188c7941bbb3c341c9 (patch) | |
tree | 3210a7688ea2bfa1bff5fd0422b52adf570edcdc /composer.json | |
parent | fdef5f460524215d806e244e5546865f4b8e01df (diff) | |
parent | 8263e71192989dc0fd28a41ac22f9c5b32eb11c4 (diff) | |
download | wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.gz wallabag-16dabc326311f084d671be188c7941bbb3c341c9.tar.zst wallabag-16dabc326311f084d671be188c7941bbb3c341c9.zip |
Merge pull request #1436 from wallabag/v2-register
Public registration & oAuth2 \o/
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json index babe9356..22cb277c 100644 --- a/composer.json +++ b/composer.json | |||
@@ -53,7 +53,8 @@ | |||
53 | "pagerfanta/pagerfanta": "~1.0.3", | 53 | "pagerfanta/pagerfanta": "~1.0.3", |
54 | "lexik/form-filter-bundle": "~4.0", | 54 | "lexik/form-filter-bundle": "~4.0", |
55 | "j0k3r/graby": "~1.0", | 55 | "j0k3r/graby": "~1.0", |
56 | "friendsofsymfony/user-bundle": "dev-master" | 56 | "friendsofsymfony/user-bundle": "dev-master", |
57 | "friendsofsymfony/oauth-server-bundle": "^1.4@dev" | ||
57 | }, | 58 | }, |
58 | "require-dev": { | 59 | "require-dev": { |
59 | "doctrine/doctrine-fixtures-bundle": "~2.2.0", | 60 | "doctrine/doctrine-fixtures-bundle": "~2.2.0", |