Merge pull request #342 from jpgnz/master

Custom time zone from .env
2015-06-10 11:34:32 +03:00 · 2015-06-10 11:34:32 +03:00 · 11fc506475
commit 11fc506475
parent 1c1bef3abb 0379d2b4f7
2 changed files with 3 additions and 2 deletions
--- a/.env.example
+++ b/.env.example
@ -3,6 +3,7 @@ APP_DEBUG=false
 APP_URL=http://ninja.dev
 APP_CIPHER=rijndael-128
 APP_KEY
+APP_TIMEZONE

 DB_TYPE=mysql
 DB_HOST=localhost
@ -17,4 +18,4 @@ MAIL_HOST
 MAIL_USERNAME
 MAIL_FROM_ADDRESS
 MAIL_FROM_NAME
-MAIL_PASSWORD
+MAIL_PASSWORD
--- a/config/app.php
+++ b/config/app.php
@ -41,7 +41,7 @@ return [
 	|
 	*/

-	'timezone' => 'UTC',
+	'timezone' => env('APP_TIMEZONE', 'UTC'),

 	/*
 	|--------------------------------------------------------------------------