Merge branch '2.3' into 2.4

2016-08-07 22:07:30 +01:00
parent f3a5a8e230 14127de3ca
commit 5a8ad3bd06
81 changed files with 365 additions and 357 deletions
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -48,11 +48,11 @@ class SetupController extends Controller
     * @var string[]
     */
    protected $mailDrivers = [
-        'smtp'      => 'SMTP',
-        'mail'      => 'Mail',
-        'sendmail'  => 'Sendmail',
-        'mailgun'   => 'Mailgun',
-        'mandrill'  => 'Mandrill',
+        'smtp'     => 'SMTP',
+        'mail'     => 'Mail',
+        'sendmail' => 'Sendmail',
+        'mailgun'  => 'Mailgun',
+        'mandrill' => 'Mandrill',
        // 'ses'       => 'Amazon SES', this will be available only if aws/aws-sdk-php is installed
        'sparkpost' => 'SparkPost',
        'log'       => 'Log (Testing)',