Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2020-11-24 18:21:08 +01:00
commit d4cf3e2c71
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
3 changed files with 16 additions and 2 deletions

View File

@ -1,6 +1,15 @@
# Release Notes # Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v8.4.2...master) ## [Unreleased](https://github.com/laravel/laravel/compare/v8.4.3...master)
## [v8.4.3 (2020-11-24)](https://github.com/laravel/laravel/compare/v8.4.2...v8.4.3)
### Added
- Add ably entry ([5182e9c](https://github.com/laravel/laravel/commit/5182e9c6de805e025fb4cfad63c210c3197002ab))
### Fixed
- Add missing null cache driver in `config/cache.php` ([#5472](https://github.com/laravel/laravel/pull/5472))
## [v8.4.2 (2020-11-17)](https://github.com/laravel/laravel/compare/v8.4.1...v8.4.2) ## [v8.4.2 (2020-11-17)](https://github.com/laravel/laravel/compare/v8.4.1...v8.4.2)

View File

@ -41,6 +41,11 @@
], ],
], ],
'ably' => [
'driver' => 'ably',
'key' => env('ABLY_KEY'),
],
'redis' => [ 'redis' => [
'driver' => 'redis', 'driver' => 'redis',
'connection' => 'default', 'connection' => 'default',

View File

@ -27,7 +27,7 @@
| same cache driver to group types of items stored in your caches. | same cache driver to group types of items stored in your caches.
| |
| Supported drivers: "apc", "array", "database", "file", | Supported drivers: "apc", "array", "database", "file",
| "memcached", "redis", "dynamodb" | "memcached", "redis", "dynamodb", "null"
| |
*/ */