Merge branch 'develop' of https://github.com/LaraDock/starter into develop

* 'develop' of https://github.com/LaraDock/starter: add app url to the config and set it to laravel.dev
2015-09-28 18:33:51 +03:00 · 2015-09-28 18:33:51 +03:00 · f34d7ed47f
commit f34d7ed47f
parent 73f8fed8fe b0e3cc3c70
2 changed files with 2 additions and 1 deletions
--- a/laravel/.env.example
+++ b/laravel/.env.example
@ -1,5 +1,6 @@
 APP_ENV=local
 APP_DEBUG=true
+APP_URL=http://laravel.dev
 APP_KEY=SomeRandomString

 CACHE_DRIVER=file
--- a/laravel/config/app.php
+++ b/laravel/config/app.php
@ -26,7 +26,7 @@ return [
    |
    */

-    'url' => 'http://localhost',
+    'url' => env('APP_URL', 'http://localhost'),

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