# Conflicts: # controller/channel.go # docker-compose.yml # web/src/components/table/ChannelsTable.js # web/src/pages/Channel/EditChannel.js
Merge branch 'alpha' into mutil_key_channel · 7ddee5ea