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
..
public/locales	Merge branch 'release/v2.6.0' into develop	2024-07-22 20:23:04 +04:00
scripts	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
src	Merge branch 'refs/heads/develop' into feature/rtl-refactor	2024-07-29 15:28:49 +02:00
.eslintrc.json	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
.gitignore	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
.prettierrc.json	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
index.d.ts	Login: add check for public oauth client	2024-06-19 18:14:43 +03:00
next.config.js	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00
package.json	Merge branch 'develop' into feature/oauth2-client	2024-06-28 13:28:10 +03:00
server.js	Login: fix start scripts	2024-05-02 17:16:45 +03:00
server.prod.js	Login: fix start scripts	2024-05-02 17:16:45 +03:00
tsconfig.json	Login: rename and fix workspace	2024-05-02 17:05:25 +03:00