L6 finalizing for merging to develop

This commit is contained in:
Luke Towers 2020-08-09 03:31:32 -06:00
parent cbd30af543
commit 871c27b8f3
1 changed files with 5 additions and 5 deletions

View File

@ -1,6 +1,6 @@
{
"name": "october/october",
"description": "OctoberCMS",
"description": "October CMS",
"homepage": "https://octobercms.com",
"type": "project",
"keywords": ["october", "cms", "octobercms", "laravel"],
@ -32,10 +32,10 @@
},
"require": {
"php": ">=7.2",
"october/rain": "dev-wip/laravel-6 as 1.0",
"october/system": "dev-wip/laravel-6",
"october/backend": "dev-wip/laravel-6",
"october/cms": "dev-wip/laravel-6",
"october/rain": "dev-develop as 1.0",
"october/system": "dev-develop",
"october/backend": "dev-develop",
"october/cms": "dev-develop",
"laravel/framework": "~6.0",
"wikimedia/composer-merge-plugin": "1.4.1"
},