Merge branch '1.0-develop' into develop

This commit is contained in:
Matthew Penner 2022-12-12 16:23:11 -07:00
commit 4138fb7497
No known key found for this signature in database
14 changed files with 149 additions and 46 deletions

View file

@ -37,13 +37,13 @@ class SettingsServiceProvider extends ServiceProvider
* when using the SMTP driver.
*/
protected array $emailKeys = [
'mail:host',
'mail:port',
'mail:mailers:smtp:host',
'mail:mailers:smtp:port',
'mail:mailers:smtp:encryption',
'mail:mailers:smtp:username',
'mail:mailers:smtp:password',
'mail:from:address',
'mail:from:name',
'mail:encryption',
'mail:username',
'mail:password',
];
/**
@ -51,7 +51,7 @@ class SettingsServiceProvider extends ServiceProvider
* configuration array.
*/
protected static array $encrypted = [
'mail:password',
'mail:mailers:smtp:password',
];
/**