Skip to content

Commit

Permalink
Update for 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
georgemjohn committed Feb 17, 2017
1 parent 9c10dfc commit d46a880
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
/public/uploads
/public/themes/*
/.idea
/framework
Homestead.json
Homestead.yaml

/framework
composer.develop.json
composer.develop.lock
composer.lock
8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@
"type": "cms",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.3.*",
"lavalite/framework": "2.0.*"
"laravel/framework": "5.4.*",
"lavalite/framework": "2.1.*"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*"
"phpunit/phpunit": "~5.0"
},
"autoload": {
"classmap": [
Expand Down
Empty file modified storage/app/public/.gitignore
100644 → 100755
Empty file.

0 comments on commit d46a880

Please sign in to comment.