mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into 1.1

Browse Source
This commit is contained in:
Luke Towers 2020-11-22 04:37:57 -06:00
commit 24d95a208b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.json
View File

@ -30,6 +30,12 @@
"docs": "https://octobercms.com/docs/",
"source": "https://github.com/octobercms/october"
},
"repositories": [
{
"type":"vcs",
"url":"https://github.com/octoberrain/composer-merge-plugin"
}
],
"require": {
"php": ">=7.2",
"october/rain": "1.1.*",
@ -37,7 +43,7 @@
"october/backend": "1.1.*",
"october/cms": "1.1.*",
"laravel/framework": "~6.0",
"wikimedia/composer-merge-plugin": "1.4.1"
"wikimedia/composer-merge-plugin": "dev-feature/composer-v2 as 1.5.0"
},
"require-dev": {
"phpunit/phpunit": "^8.4|^9.3.3",