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

merge...
This commit is contained in:
nobohan 2018-04-04 15:56:01 +02:00
commit def1b1c01f

View File

@ -34,8 +34,7 @@
"doctrine/doctrine-migrations-bundle": "~1.1",
"doctrine/migrations": "~1.0",
"symfony/monolog-bundle": "^2.7",
"chill-project/main": "dev-master@dev",
"phpoffice/phpspreadsheet": "dev-develop#9e835676a6a2df9f7e445a28d4d89f6bd296a7c5@dev"
"chill-project/main": "dev-upgrade-sf3@dev"
},
"require-dev": {
"chill-project/person": "dev-master@dev",