Tatiana Lopaeva aa6c02b190 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/Core/NotifyHelper.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # packages/asc-web-common/api/settings/index.js # packages/asc-web-common/components/PrivateRoute/index.js # packages/asc-web-common/store/SettingsStore.js # products/ASC.Files/Client/public/locales/en/SelectFile.json # products/ASC.Files/Client/public/locales/ru/SelectFile.json # products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Client/src/Shell.jsx		2021-09-20 16:26:34 +03:00
..
ASC.Calendar	Merge branch 'develop' into release/1.0.0	2021-09-15 14:45:33 +03:00
ASC.CRM	Merge branch 'develop' into release/1.0.0	2021-09-15 14:45:33 +03:00
ASC.Files	Merge branch 'develop' into feature/backup	2021-09-20 16:26:34 +03:00
ASC.Mail	Merge branch 'develop' into release/1.0.0	2021-09-15 14:45:33 +03:00
ASC.People	Personal: added register method	2021-09-17 17:32:37 +03:00
ASC.Projects	Merge branch 'develop' into release/1.0.0	2021-09-15 14:45:33 +03:00