Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
arthurkushman committed Oct 19, 2019
2 parents 4e309fd + 0c6c251 commit c053a0a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"php": ">=7.1",
"ext-json": "*",
"ext-pdo": "*",
"illuminate/container": "^5.8",
"illuminate/container": "^5.8|^6.0",
"lcobucci/jwt": "^3.2",
"league/fractal": "~0.14",
"nwidart/laravel-modules": ">=3.1",
Expand All @@ -49,9 +49,9 @@
},
"require-dev": {
"codeception/codeception": "^2.4",
"darkaonline/l5-swagger": "5.8.*",
"darkaonline/l5-swagger": "5.8|^6.0",
"fzaninotto/faker": "^1.7",
"laravel/framework": ">=5.3",
"laravel/framework": ">=5.3|^6.0",
"mockery/mockery": "~1.0",
"phpunit/phpunit": ">=6.5"
},
Expand Down

0 comments on commit c053a0a

Please sign in to comment.