Merge branch 'master' into develop

2019-08-04 13:49:26 -07:00 · 2019-08-04 13:49:26 -07:00 · 81143e231a
commit 81143e231a
parent 2716ff8841 bd5875084b
41 changed files with 303 additions and 190 deletions
--- a/composer.json
+++ b/composer.json
@ -45,7 +45,7 @@
        "barryvdh/laravel-ide-helper": "^2.5",
        "codedungeon/phpunit-result-printer": "^0.17.1",
        "filp/whoops": "^2.1",
-        "friendsofphp/php-cs-fixer": "^2.11.1",
+        "friendsofphp/php-cs-fixer": "^2.15.1",
        "fzaninotto/faker": "^1.6",
        "laravel/dusk": "^3.0",
        "martinlindhe/laravel-vue-i18n-generator": "^0.1.28",