mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-18 05:36:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1537 from bdunogier/update_lock

Browse source 
Updated composer.lock
This commit is contained in:
Jeremy Benoist 2015-12-24 08:37:27 +01:00
commit 22c1d29b89
3 changed files with 262 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -16,7 +16,6 @@ cache:
- $HOME/.composer/cache - $HOME/.composer/cache
php: php:
- 5.4
- 5.5 - 5.5
- 5.6 - 5.6
- 7.0 - 7.0

4
composer.json
View file

@ -28,7 +28,7 @@
"issues": "https://github.com/wallabag/wallabag/issues" "issues": "https://github.com/wallabag/wallabag/issues"
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.5.0",
"symfony/symfony": "~2.7.0", "symfony/symfony": "~2.7.0",
"doctrine/orm": "~2.3", "doctrine/orm": "~2.3",
"doctrine/doctrine-bundle": "1.5.2", "doctrine/doctrine-bundle": "1.5.2",
@ -55,7 +55,7 @@
"j0k3r/graby": "~1.0", "j0k3r/graby": "~1.0",
"friendsofsymfony/user-bundle": "dev-master", "friendsofsymfony/user-bundle": "dev-master",
"friendsofsymfony/oauth-server-bundle": "^1.4@dev", "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
"scheb/two-factor-bundle": "~1.4", "scheb/two-factor-bundle": "~1.4.0",
"grandt/phpepub": "~4.0", "grandt/phpepub": "~4.0",
"wallabag/php-mobi": "~1.0.0", "wallabag/php-mobi": "~1.0.0",
"kphoen/rulerz-bundle": "~0.10" "kphoen/rulerz-bundle": "~0.10"

496
composer.lock generated
View file

File diff suppressed because it is too large Load diff