Merge branch 'upgrade-sf3' of framagit.org:Chill-project/Chill-Person into upgrade-sf3

merge ...
This commit is contained in:
nobohan 2018-04-04 17:53:27 +02:00
commit cf6b36c8f8

View File

@ -26,21 +26,20 @@
"symfony/yaml": "~2.7",
"symfony/symfony": "~2.8",
"doctrine/dbal": "~2.5",
"doctrine/orm": "~2.4",
"doctrine/orm": "~2.5",
"doctrine/common": "~2.4",
"doctrine/doctrine-bundle": "~1.2",
"chill-project/main": "dev-master",
"chill-project/custom-fields": "dev-master@dev",
"chill-project/main": "dev-upgrade-sf3",
"chill-project/custom-fields": "dev-upgrade-sf3@dev",
"doctrine/doctrine-fixtures-bundle": "~2.2",
"champs-libres/composer-bundle-migration": "~1.0",
"doctrine/doctrine-migrations-bundle": "~1.1",
"doctrine/migrations": "~1.0",
"phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev"
"doctrine/migrations": "~1.0"
},
"require-dev": {
"symfony/phpunit-bridge": "^2.7",
"symfony/phpunit-bridge": "~2.7",
"fzaninotto/faker": "~1",
"phpunit/phpunit": "~5.0"
"phpunit/phpunit": "~5.6"
},
"scripts": {
"post-install-cmd": [