diff options
| author | Bertrand Dunogier <bd@ez.no> | 2015-12-23 16:45:24 +0100 |
|---|---|---|
| committer | Bertrand Dunogier <bd@ez.no> | 2015-12-23 22:49:03 +0100 |
| commit | d4aa17436700713fcb4eb5c4a2c48182f37c3b5e (patch) | |
| tree | 62fc5d69837204b472b31f9c9dea27f8966fab4b /composer.json | |
| parent | da2240f9d409a8301a1d469823a265780e6f1b7b (diff) | |
| download | wallabag-d4aa17436700713fcb4eb5c4a2c48182f37c3b5e.tar.gz wallabag-d4aa17436700713fcb4eb5c4a2c48182f37c3b5e.tar.zst wallabag-d4aa17436700713fcb4eb5c4a2c48182f37c3b5e.zip | |
Updated composer.lock
Had to restrict scheb/two-factor-bundle to ~1.4.0 because of a circular service reference.
See https://github.com/scheb/two-factor-bundle/issues/33.
Also updated php version requirement to 5.5.0.
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 26608cdc..29784d5c 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | "issues": "https://github.com/wallabag/wallabag/issues" | 28 | "issues": "https://github.com/wallabag/wallabag/issues" |
| 29 | }, | 29 | }, |
| 30 | "require": { | 30 | "require": { |
| 31 | "php": ">=5.3.3", | 31 | "php": ">=5.5.0", |
| 32 | "symfony/symfony": "~2.7.0", | 32 | "symfony/symfony": "~2.7.0", |
| 33 | "doctrine/orm": "~2.3", | 33 | "doctrine/orm": "~2.3", |
| 34 | "doctrine/doctrine-bundle": "1.5.2", | 34 | "doctrine/doctrine-bundle": "1.5.2", |
| @@ -55,7 +55,7 @@ | |||
| 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 | "friendsofsymfony/oauth-server-bundle": "^1.4@dev", |
| 58 | "scheb/two-factor-bundle": "~1.4", | 58 | "scheb/two-factor-bundle": "~1.4.0", |
| 59 | "grandt/phpepub": "~4.0", | 59 | "grandt/phpepub": "~4.0", |
| 60 | "wallabag/php-mobi": "~1.0.0", | 60 | "wallabag/php-mobi": "~1.0.0", |
| 61 | "kphoen/rulerz-bundle": "~0.10" | 61 | "kphoen/rulerz-bundle": "~0.10" |