diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
| commit | e4cf672ccf61689ba28c2e89fc55f83167800b18 (patch) | |
| tree | 5dc22c97797bdcdd0a3d2a7e182410f04a748c1e /composer.json | |
| parent | e57df5611fe82ce61a71d51c762ee9296f18c3ac (diff) | |
| parent | dbe94e73a9eaf3acb250812913b0303b35d01a2e (diff) | |
| download | wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.gz wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.zst wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
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", |