Merge branch 'master' of https://git.unicaen.fr/lib/unicaen/app
Conflicts: CHANGELOG.md
... | ... | @@ -8,7 +8,7 @@ |
"ext-ldap": "*", | ||
"beberlei/assert": "^2.9", | ||
"doctrine/doctrine-orm-module": "*", | ||
"mpdf/mpdf": "^7.1", | ||
"mpdf/mpdf": "^7.1 || ^8.0", | ||
"ocramius/proxy-manager": "^2.0", | ||
"zendframework/zend-config": "^3.2", | ||
"zendframework/zend-console": "^2.8", | ||
... | ... | @@ -33,8 +33,7 @@ |
"zendframework/zend-servicemanager": "^3.4", | ||
"zendframework/zend-session": "^2.8", | ||
"zendframework/zend-version": "^2.4", | ||
"zendframework/zend-view": "^2.11", | ||
"zfcampus/zf-asset-manager": "^1.2" | ||
"zendframework/zend-view": "^2.11" | ||
}, | ||
"require-dev": { | ||
"zendframework/zend-test": "^3.2", | ||
... | ... |
composer.lock
deleted
100644 → 0
This diff is collapsed.
Please register or sign in to comment