Merge branch 'master' into develop
This commit is contained in:
commit
211dfc24e7
|
@ -54,6 +54,19 @@
|
||||||
|
|
||||||
'locale' => 'en',
|
'locale' => 'en',
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Application Fallback Locale
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| The fallback locale determines the locale to use when the current one
|
||||||
|
| is not available. You may change the value to correspond to any of
|
||||||
|
| the language folders that are provided through your application.
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
'fallback_locale' => 'en',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Encryption Key
|
| Encryption Key
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
|
|
||||||
| Here you may provide the host address of the SMTP server used by your
|
| Here you may provide the host address of the SMTP server used by your
|
||||||
| applications. A default option is provided that is compatible with
|
| applications. A default option is provided that is compatible with
|
||||||
| the Postmark mail service, which will provide reliable delivery.
|
| the Mailgun mail service which will provide reliable deliveries.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@
|
||||||
|
|
|
|
||||||
| This is the SMTP port used by your application to delivery e-mails to
|
| This is the SMTP port used by your application to delivery e-mails to
|
||||||
| users of your application. Like the host we have set this value to
|
| users of your application. Like the host we have set this value to
|
||||||
| stay compatible with the Postmark e-mail application by default.
|
| stay compatible with the Mailgun e-mail applications by default.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
2
artisan
2
artisan
|
@ -21,7 +21,7 @@ require __DIR__.'/bootstrap/autoload.php';
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| We need to illuminate PHP development, so let's turn on the lights.
|
| We need to illuminate PHP development, so let's turn on the lights.
|
||||||
| This bootstrap the framework and gets it ready for use, then it
|
| This bootstraps the framework and gets it ready for and then it
|
||||||
| will load up this application so that we can run it and send
|
| will load up this application so that we can run it and send
|
||||||
| the responses back to the browser and delight these users.
|
| the responses back to the browser and delight these users.
|
||||||
|
|
|
|
||||||
|
|
Loading…
Reference in New Issue