# Conflicts:
#	public_new/js/views/collaboration/collaboration-add-user.js
#	public_new/js/views/collaboration/collaboration.js

Fixed disable the scroll

See merge request !219

Feature/add user in collaboration

See merge request !218

# Conflicts:
#	public_new/js/views/collaboration/collaboration-add-user.js

Feature/archive list order

See merge request !216

Fix/load 100 more messages

See merge request !215

# Conflicts:
#	public_new/js/sockets/chat-websocket-message.js

# Conflicts:
#	public_new/js/sockets/chat-websocket-message.js
#	public_new/js/views/collaboration/collaboration-add-user.js
#	public_new/js/views/collaboration/share-event-listener.js

Squash/socket kim ec

See merge request !217

Squash/socket

See merge request !206

Merge branch 'squash/socket_kim-ec' of gitlab.agentec.jp:abookCommunication/chat_webview into squash/socket_kim-ec

Feature/#43373 roomname placeholder

See merge request !213

Feature/host change

See merge request !212

#43367 【ABook Communication】チャット画面を10分間放置するとセッションが切れる

See merge request !214

# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-bridge.js
#	public_new/js/views/collaboration/fermi-web-socket-message-handler.js

# Conflicts:
#	public_new/js/views/collaboration/share-event-listener.js