Skip to content

Commit

Permalink
Merge pull request #348 from avored/dev
Browse files Browse the repository at this point in the history
merge dev to master
  • Loading branch information
indpurvesh authored Jul 5, 2019
2 parents 04f8cbd + 2c5a8fb commit 3986892
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_NAME=Laravel
APP_NAME=AvoRed
APP_ENV=local
APP_KEY=
APP_DEBUG=true
Expand All @@ -9,9 +9,9 @@ LOG_CHANNEL=stack
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=laravel
DB_DATABASE=avored
DB_USERNAME=root
DB_PASSWORD=
DB_PASSWORD=secret

BROADCAST_DRIVER=log
CACHE_DRIVER=file
Expand Down
10 changes: 4 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "laravel/laravel",
"name": "avored/laravel-ecommerce",
"type": "project",
"description": "The Laravel Framework.",
"description": "The AvoRed Ecommerce App",
"keywords": [
"framework",
"laravel"
],
"license": "MIT",
"require": {
"php": "^7.1.3",
"avored/framework": "dev-dev",
"avored/framework": "3.0.*",
"fideloper/proxy": "^4.0",
"laravel/framework": "5.8.*",
"laravel/tinker": "^1.0"
Expand All @@ -20,7 +20,6 @@
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0",
"orchestra/testbench": "^3.8",
"phpunit/phpunit": "^7.5"
},
"config": {
Expand All @@ -44,8 +43,7 @@
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/",
"AvoRed\\Framework\\Tests\\": "vendor/avored/framework/tests/"
"Tests\\": "tests/"
}
},
"minimum-stability": "dev",
Expand Down

0 comments on commit 3986892

Please sign in to comment.