Merge remote-tracking branch 'origin/pr/console-footer' into pr/console-footer
# Conflicts: # web/src/components/table/channels/modals/EditChannelModal.jsx # web/src/hooks/common/useSidebar.js
This commit is contained in:
commit
670e5f4dbe