Merge branch 'master' into develop

README.md

@@ -60,6 +60,7 @@ ## Laravel Sponsors
 - [Hyper Host](https://hyper.host)
 - [Appoly](https://www.appoly.co.uk)
 - [OP.GG](https://op.gg)
+- [云软科技](http://www.yunruan.ltd/)
 
 ## Contributing
 

config/filesystems.php

@@ -61,7 +61,7 @@
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
-            'url' => env('AWS_URL'),
+            'endpoint' => env('AWS_URL'),
         ],
 
     ],

config/mail.php

@@ -41,6 +41,7 @@
             'encryption' => env('MAIL_ENCRYPTION', 'tls'),
             'username' => env('MAIL_USERNAME'),
             'password' => env('MAIL_PASSWORD'),
+            'timeout' => null,
         ],
 
         'ses' => [