Merge branch 'master' into develop

2016-07-28 15:13:28 -04:00
parent 2a8c38ac31 5658575212
commit 0203d5d866
1 changed files with 1 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
    },
    "scripts": {
        "post-root-package-install": [
-            "php -r \"copy('.env.example', '.env');\""
+            "php -r \"file_exists('.env') || copy('.env.example', '.env');\""
        ],
        "post-create-project-cmd": [
            "php artisan key:generate"