Skip to content

Commit

Permalink
Merge pull request #3 from frdteknikelektro/master
Browse files Browse the repository at this point in the history
Support Laravel 5.4 - 5.8
  • Loading branch information
frdteknikelektro authored Nov 1, 2019
2 parents 4fca524 + cfbbb2b commit 82bdf07
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 80,298 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.idea
/node_modules
/public/hot
/storage/*.key
Expand Down
13 changes: 10 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "atnic/laravel-sb-admin-2",
"description": "Laravel 5.4 Package for integrating SB Admin 2 template and this package is Laravel Mix friendly.",
"keywords": ["laravel", "sb admin", "sb admin 2", "admin-lte", "package", "composer"],
"description": "Laravel 5.4 | 5.5 | 5.6 | 5.7 | 5.8 Package for integrating SB Admin 2 template and this package is Laravel Mix friendly.",
"keywords": ["laravel", "sb admin", "sb admin 2", "package", "composer"],
"license": "MIT",
"type": "package",
"require": {
"php": ">=5.6.4",
"laravel/framework": "5.4.*"
"laravel/framework": "5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.*"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
Expand All @@ -23,5 +23,12 @@
"psr-4": {
"Atnic\\SBAdmin2\\Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"providers": [
"Atnic\\SBAdmin2\\Providers\\AppServiceProvider"
]
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"axios": "^0.16.2",
"axios": "^0.19.0",
"bootstrap-sass": "^3.3.7",
"bootstrap-social": "^5.1.1",
"cross-env": "^5.0.1",
Expand Down
Loading

0 comments on commit 82bdf07

Please sign in to comment.