Merge branch 'master' into develop
# Conflicts: # CHANGELOG.md
This commit is contained in:
commit
71c6571fc8
|
@ -5,6 +5,7 @@ APP_DEBUG=true
|
||||||
APP_URL=http://localhost
|
APP_URL=http://localhost
|
||||||
|
|
||||||
LOG_CHANNEL=stack
|
LOG_CHANNEL=stack
|
||||||
|
LOG_LEVEL=debug
|
||||||
|
|
||||||
DB_CONNECTION=mysql
|
DB_CONNECTION=mysql
|
||||||
DB_HOST=127.0.0.1
|
DB_HOST=127.0.0.1
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
# Release Notes
|
# Release Notes
|
||||||
|
|
||||||
## [Unreleased](https://github.com/laravel/laravel/compare/v8.1.0...develop)
|
## [Unreleased](https://github.com/laravel/laravel/compare/v8.2.0...develop)
|
||||||
|
|
||||||
|
|
||||||
|
## [v8.2.0 (2020-10-20)](https://github.com/laravel/laravel/compare/v8.1.0...v8.2.0)
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Added 'LOG_LEVEL' env variable in `.env.example` ([#5445](https://github.com/laravel/laravel/pull/5445))
|
||||||
|
- Add 'multiple_of' translation ([#5449](https://github.com/laravel/laravel/pull/5449))
|
||||||
|
|
||||||
|
|
||||||
## [v8.1.0 (2020-10-06)](https://github.com/laravel/laravel/compare/v8.0.3...v8.1.0)
|
## [v8.1.0 (2020-10-06)](https://github.com/laravel/laravel/compare/v8.0.3...v8.1.0)
|
||||||
|
|
|
@ -90,6 +90,7 @@
|
||||||
'string' => 'The :attribute must be at least :min characters.',
|
'string' => 'The :attribute must be at least :min characters.',
|
||||||
'array' => 'The :attribute must have at least :min items.',
|
'array' => 'The :attribute must have at least :min items.',
|
||||||
],
|
],
|
||||||
|
'multiple_of' => 'The :attribute must be a multiple of :value',
|
||||||
'not_in' => 'The selected :attribute is invalid.',
|
'not_in' => 'The selected :attribute is invalid.',
|
||||||
'not_regex' => 'The :attribute format is invalid.',
|
'not_regex' => 'The :attribute format is invalid.',
|
||||||
'numeric' => 'The :attribute must be a number.',
|
'numeric' => 'The :attribute must be a number.',
|
||||||
|
|
Loading…
Reference in New Issue