Merge branch 'arcpatch-D443'
Conflicts:
lib/kolab_chat.ex
lib/kolab_chat/web/channels/room_channel.ex
lib/kolab_chat/web/controllers/chat_controller.ex
mix.lock
Merge branch 'arcpatch-D443' Tags None Referenced Files None Subscribers None
Description
Details
Merged Changes |