Aleksandr Lushkin 31323d26ba Merge branch 'refs/heads/develop' into feature/rtl-refactor ... # Conflicts: # packages/client/src/components/ItemIcon.js # packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeDropdown/DropdownMobile.js # packages/client/src/components/panels/EditLinkPanel/StyledEditLinkPanel.js # packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js # packages/client/src/components/panels/UploadPanel/FileRow.js # packages/client/src/pages/FormGallery/Filter/SortFilter/index.styled.js # packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/RowView/UsersRowContent.tsx # packages/client/src/pages/PortalSettings/categories/storage-management/StyledComponent.js # packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js # packages/shared/components/media-viewer/MediaViewer.styled.ts		2024-07-29 15:28:49 +02:00
..
body	Merge branch 'refs/heads/develop' into feature/rtl-refactor	2024-07-29 15:28:49 +02:00
header	Replaced copyright start year + format	2024-03-21 18:09:55 +04:00