TatianaLopaeva 3ef16948fc Merge branch 'develop' into feature/backup ... # Conflicts: # common/services/ASC.Data.Backup/Core/NotifyHelper.cs # products/ASC.Files/Client/public/locales/en/OperationsPanel.json # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Server/DocStore # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js		2021-06-08 15:03:49 +03:00
..
asc-web-common	Merge branch 'develop' into feature/backup	2021-06-08 15:03:49 +03:00
asc-web-components	Merge branch 'develop' into feature/backup	2021-06-08 15:03:49 +03:00