Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/getcandy/candy-api
Browse files Browse the repository at this point in the history
  • Loading branch information
alecritson committed May 27, 2020
2 parents abaae94 + b2c66f7 commit b430e52
Show file tree
Hide file tree
Showing 12 changed files with 8,371 additions and 2,337 deletions.
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"intervention/image": "^2.4.2",
"kalnoy/nestedset": "^5.0",
"laravel/framework": "^7.0",
"laravel/passport": "^9.2.1",
"league/fractal": "^0.17.0",
"doctrine/dbal": "2.9.2",
"ruflin/elastica": "^6.1",
Expand Down
Loading

0 comments on commit b430e52

Please sign in to comment.