Merge branch 'master' into develop

GrahamCampbell · GrahamCampbell · commit 0203d5d866ed · 2016-07-28T15:13:28.000-04:00
diff --git 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"
