diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-11-23 09:53:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-23 09:53:18 +0100 |
commit | f4a98334903f01e6109b09e27dc1ebefab8f8865 (patch) | |
tree | 91bc4aaa5bbebb141911477113d28ab00973603f /composer.json | |
parent | 75a4b3b23fcc183d926eb7cc782762085661b2da (diff) | |
parent | fcbf253b6bc0772adaf0d0e7cc51de50046cf64e (diff) | |
download | wallabag-f4a98334903f01e6109b09e27dc1ebefab8f8865.tar.gz wallabag-f4a98334903f01e6109b09e27dc1ebefab8f8865.tar.zst wallabag-f4a98334903f01e6109b09e27dc1ebefab8f8865.zip |
Merge pull request #2620 from wallabag/fix-password-layout
Fix password layout
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 e2aeb424..a5ef9529 100644 --- a/composer.json +++ b/composer.json | |||
@@ -49,7 +49,7 @@ | |||
49 | "doctrine/doctrine-cache-bundle": "^1.2", | 49 | "doctrine/doctrine-cache-bundle": "^1.2", |
50 | "twig/extensions": "~1.0", | 50 | "twig/extensions": "~1.0", |
51 | "symfony/swiftmailer-bundle": "^2.3", | 51 | "symfony/swiftmailer-bundle": "^2.3", |
52 | "symfony/monolog-bundle": "^2.8", | 52 | "symfony/monolog-bundle": "^3.0", |
53 | "sensio/distribution-bundle": "^5.0", | 53 | "sensio/distribution-bundle": "^5.0", |
54 | "sensio/framework-extra-bundle": "^3.0.2", | 54 | "sensio/framework-extra-bundle": "^3.0.2", |
55 | "incenteev/composer-parameter-handler": "^2.0", | 55 | "incenteev/composer-parameter-handler": "^2.0", |
@@ -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", |