mirror of
https://github.com/Novaloop-AG/healthchat-web.git
synced 2026-11-04 01:19:41 +00:00
a71134df0f
# Conflicts: # res/css/structures/_GenericDropdownMenu.pcss # res/css/views/elements/_ImageView.pcss # res/css/views/rooms/_MessageComposer.pcss # src/components/structures/RoomStatusBar.tsx # src/components/views/elements/Pill.tsx # src/components/views/messages/MessageActionBar.tsx # src/components/views/rooms/RoomKnocksBar.tsx # src/components/views/rooms/RoomTileSubtitle.tsx # src/components/views/settings/tabs/room/PeopleRoomSettingsTab.tsx