Merge branch 'develop_kimjs' into 'develop'

プッシュメッセージから文書協業接続時、関連資料画面表示問題と会議室接続問題対応

See merge request !237

public_new/js/views/collaboration/fermi-web-socket-message-handler.js

@@ -91,6 +91,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
     case "API_WELCOME":
       if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) {
         FermiWebSocketMessageHandler.apiWelcome();
+      } else {
+        FermiWebSocketBridge.getCollaborationType()
       }
       CollaborationFeature.updateHost();
       break;