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
..
base.js	Merge branch 'develop' into feature/backup	2021-06-18 18:08:38 +03:00
dark.js	Merge branch 'develop' into feature/backup	2021-06-18 18:08:38 +03:00
index.js	Web: Components: changed component hierarchy	2021-02-24 17:42:09 +03:00