Merge branch 'master' into develop

2019-11-27 15:21:41 +00:00 · 2019-11-27 15:21:41 +00:00 · fb3e88c313
parent b7a5bc7f3c b56fe84011
commit fb3e88c313
2 changed files with 2 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@ -11,7 +11,7 @@
        "php": "^7.2",
        "fideloper/proxy": "^4.0",
        "laravel/framework": "^7.0",
-        "laravel/tinker": "^1.0"
+        "laravel/tinker": "^2.0"
    },
    "require-dev": {
        "fzaninotto/faker": "^1.4",
--- a/resources/js/bootstrap.js
+++ b/resources/js/bootstrap.js
@ -24,5 +24,5 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 //     broadcaster: 'pusher',
 //     key: process.env.MIX_PUSHER_APP_KEY,
 //     cluster: process.env.MIX_PUSHER_APP_CLUSTER,
-//     encrypted: true
+//     forceTLS: true
 // });