Merge branch '1.0-develop' into develop
This commit is contained in:
commit
18f6611a2d
60 changed files with 181 additions and 152 deletions
|
@ -57,7 +57,7 @@ class SettingsServiceProvider extends ServiceProvider
|
|||
/**
|
||||
* Boot the service provider.
|
||||
*/
|
||||
public function boot(ConfigRepository $config, Encrypter $encrypter, Log $log, SettingsRepositoryInterface $settings)
|
||||
public function boot(ConfigRepository $config, Encrypter $encrypter, Log $log, SettingsRepositoryInterface $settings): void
|
||||
{
|
||||
// Only set the email driver settings from the database if we
|
||||
// are configured using SMTP as the driver.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue