TatianaLopaeva ae17671043 Merge branch 'develop' into feature/backup ... # Conflicts: # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/store/SettingsSetupStore.js		2021-06-18 18:08:38 +03:00
..
asc-web-common	Merge branch 'develop' into feature/backup	2021-06-18 18:08:38 +03:00
asc-web-components	Merge branch 'develop' into feature/backup	2021-06-18 18:08:38 +03:00