Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
rakieta2015 committed Jun 17, 2020
2 parents 3c38894 + 25d9a18 commit 45e8546
Show file tree
Hide file tree
Showing 2 changed files with 894 additions and 449 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"require": {
"php": "^7.2.5",
"fideloper/proxy": "^4.2",
"laravel/framework": "^7.4",
"laravel/framework": "7.4",
"fruitcake/laravel-cors": "^1.0",
"guzzlehttp/guzzle": "^6.3",
"laravel/tinker": "^2.3.0",
Expand Down
Loading

0 comments on commit 45e8546

Please sign in to comment.