Tatiana Lopaeva 683c628c28 Merge branch 'develop' into feature/user-quota ... # Conflicts: # packages/client/src/components/GlobalEvents/EditRoomEvent.js # packages/client/src/components/dialogs/index.js # packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js # packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js # packages/client/src/store/FilesStore.js # packages/client/src/store/SelectedFolderStore.js # packages/common/components/Loaders/index.js # packages/shared/api/files/index.ts # public/locales/en/Common.json		2024-01-28 20:44:38 +03:00
..
client	Merge branch 'develop' into feature/user-quota	2024-01-28 20:44:38 +03:00
common	Merge branch 'develop' into feature/user-quota	2024-01-28 20:44:38 +03:00
editor	Merge branch 'hotfix/v2.0.2' into develop	2024-01-25 16:32:37 +04:00
login	Merge branch 'hotfix/v2.0.2' into develop	2024-01-25 16:32:37 +04:00
management	Merge branch 'develop' into feature/user-quota	2024-01-28 20:44:38 +03:00
shared	Merge branch 'develop' into feature/user-quota	2024-01-28 20:44:38 +03:00