Alexey Safronov 556df6e20c Merge branch 'hotfix/v2.6.1' into develop ... # Conflicts: # packages/client/src/components/Article/MainButton/index.js # packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js # packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js # packages/client/src/pages/Confirm/sub-components/auth.js # packages/client/src/pages/Home/Section/Header/index.js # packages/client/src/store/DialogsStore.js # packages/shared/components/access-right-select/AccessRightSelect.tsx		2024-08-19 17:26:45 +04:00
..
locales	Merge branch 'hotfix/v2.6.1' into develop	2024-08-19 17:26:45 +04:00
index.html	Client: Removed temp data	2024-06-17 15:17:57 +04:00