Elyor Djalilov f4584a69f9 Merge branch 'develop' into feature/active-sessions ... # Conflicts: # packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js # packages/shared/store/SettingsStore.ts # public/locales/en/Common.json		2024-02-03 16:27:28 +05:00
..
Common.json	Merge branch 'develop' into feature/active-sessions	2024-02-03 16:27:28 +05:00