Merge branch 'master' into fix_cart_database_timestamps

This commit is contained in:
Patrick
2019-03-01 15:29:33 +01:00
committed by GitHub
6 changed files with 39 additions and 29 deletions

View File

@@ -17,12 +17,12 @@
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
"illuminate/session": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
"illuminate/events": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
"nesbot/carbon": "^1.26.3"
"nesbot/carbon": "^1.26.3 || ^2.0"
},
"require-dev": {
"phpunit/phpunit": "~5.0|~6.0|~7.0",
"mockery/mockery": "~0.9.0",
"orchestra/testbench": "~3.1"
"phpunit/phpunit": "~5.0||~6.0||~7.0||~8.0",
"mockery/mockery": "^1.0",
"orchestra/testbench": "^3.4"
},
"autoload": {
"psr-4": {