Skip to content

Commit

Permalink
Merge branch '1.1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeTowers committed Sep 7, 2020
2 parents fa9417d + 6389554 commit 4340b65
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
},
"require": {
"php": ">=7.2",
"october/rain": "dev-develop as 1.0",
"october/system": "dev-develop",
"october/backend": "dev-develop",
"october/cms": "dev-develop",
"october/rain": "1.1.*",
"october/system": "1.1.*",
"october/backend": "1.1.*",
"october/cms": "1.1.*",
"laravel/framework": "~6.0",
"wikimedia/composer-merge-plugin": "1.4.1"
},
Expand Down

0 comments on commit 4340b65

Please sign in to comment.