Vladimir Khvan abb8ee3464 Merge branch 'develop' into feature/data-migration ... Conflicts: packages/client/public/locales/en/People.json packages/client/public/locales/en/Settings.json packages/client/public/locales/ru/People.json packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js packages/client/src/pages/PortalSettings/utils/settingsTree.js packages/client/src/store/index.js packages/shared/enums/index.ts packages/shared/themes/base.ts packages/shared/themes/dark.ts		2024-02-27 14:51:49 +05:00
..
locales	Merge branch 'develop' into feature/data-migration	2024-02-27 14:51:49 +05:00
index.html	Client:public: Fixed doctype	2024-02-01 12:58:22 +05:00