Merge branch 'master' into develop

0203d5d8 · Graham Campbell · 2a8c38ac · 56585752 · 0203d5d8
Commit 0203d5d8 authored Jul 28, 2016 by Graham Campbell
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

composer.json composer.json +1 -1

No files found.
--- 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"