Merge branch 'master' into develop

2017-12-26 12:32:52 +00:00
parent cd53623249 73cff166c7
commit 8067ed6dd3
4 changed files with 7 additions and 3 deletions
--- a/resources/assets/js/bootstrap.js
+++ b/resources/assets/js/bootstrap.js
@@ -50,5 +50,7 @@ if (token) {

 // window.Echo = new Echo({
 //     broadcaster: 'pusher',
-//     key: 'your-pusher-key'
+//     key: 'your-pusher-key',
+//     cluster: 'mt1',
+//     encrypted: true
 // });