HomePhorge

Merge branch 'arcpatch-D443'

Description

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

Details

Provenance
machniakAuthored on Jun 29 2017, 1:10 PM
machniakPushed on Jun 29 2017, 1:11 PM
Parents
rKC565a335ae7c7: More on channels management
rKCd55c56bc8952: leave and terminate for tracking those comings and goings
Branches
Unknown
Tags
Unknown
References
HEAD -> master
Build Status
Buildable 10769