Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2021-06-01 17:49:55 +02:00
commit 92cd828c64
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
4 changed files with 12 additions and 1 deletions

View File

@ -16,6 +16,7 @@ DB_PASSWORD=
BROADCAST_DRIVER=log
CACHE_DRIVER=file
FILESYSTEM_DRIVER=local
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120
@ -39,6 +40,7 @@ AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=us-east-1
AWS_BUCKET=
AWS_USE_PATH_STYLE_ENDPOINT=false
PUSHER_APP_ID=
PUSHER_APP_KEY=

2
.gitignore vendored
View File

@ -11,3 +11,5 @@ Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
/.idea
/.vscode

View File

@ -1,6 +1,12 @@
# Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.18...master)
## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.19...master)
## [v8.5.19 (2021-06-01)](https://github.com/laravel/laravel/compare/v8.5.18...v8.5.19)
### Changed
- Update skeleton for filesystem tweaks to make sail usage easier ([c5d38d4](https://github.com/laravel/laravel/commit/c5d38d469a447d6831c3cf56d193be7941d6586f))
## [v8.5.18 (2021-05-18)](https://github.com/laravel/laravel/compare/v8.5.17...v8.5.18)

View File

@ -50,6 +50,7 @@
'bucket' => env('AWS_BUCKET'),
'url' => env('AWS_URL'),
'endpoint' => env('AWS_ENDPOINT'),
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
],
],