Vladimir Khvan b864cc12db Merge branch 'develop' into feature/data-migration ... Conflicts: packages/client/public/locales/en/Settings.json packages/client/public/locales/ru/People.json packages/client/public/locales/ru/Settings.json public/locales/ru/Common.json		2023-11-30 14:31:07 +05:00
..
index.js	Merge branch 'develop' into feature/data-migration	2023-11-30 14:31:07 +05:00
sharedDependencies.js	Web: remove dep from global package.json and move to common	2023-04-20 17:38:05 +03:00