Alexey Safronov 11fe4f4942 Merge branch 'develop' into feature/new-empty-screen ... # Conflicts: # packages/client/src/components/EmptyContainer/index.js # public/locales/en/Common.json		2024-08-23 20:48:21 +04:00
..
client	Merge branch 'develop' into feature/new-empty-screen	2024-08-23 20:48:21 +04:00
doceditor	Merge branch 'hotfix/v2.6.1' into develop	2024-08-23 20:41:35 +04:00
login	Merge branch 'hotfix/v2.6.1' into develop	2024-08-23 20:41:35 +04:00
management	Merge branch 'hotfix/v2.6.1' into develop	2024-08-22 12:29:56 +04:00
shared	Merge branch 'develop' into feature/new-empty-screen	2024-08-23 20:48:21 +04:00