Merge branch '1.0-develop' into develop
This commit is contained in:
commit
62238ad418
5 changed files with 12 additions and 5 deletions
|
@ -57,7 +57,7 @@ class EmailSettingsCommand extends Command
|
|||
$this->{$method}();
|
||||
}
|
||||
|
||||
$this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask(
|
||||
$this->variables['MAIL_FROM_ADDRESS'] = $this->option('email') ?? $this->ask(
|
||||
trans('command/messages.environment.mail.ask_mail_from'),
|
||||
$this->config->get('mail.from.address')
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue