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
..
Contracts	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Core	Merge branch 'develop' into feature/backup	2021-09-20 16:26:34 +03:00
EF	Merge branch 'develop' into feature/backup	2021-09-20 16:26:34 +03:00
Exceptions	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Extensions	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Listerners	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
protos	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Service	Merge branch 'develop' into feature/backup	2021-09-20 16:26:34 +03:00
Storage	Merge branch 'develop' into feature/backup	2021-09-20 16:26:34 +03:00
Tasks	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Utils	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
ActionInvoker.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
ASC.Data.Backup.Core.csproj	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
BackupAjaxHandler.cs	Merge branch 'develop' into feature/backup	2021-09-20 16:26:34 +03:00
BackupFileUploadHandler.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
BackupResource.Designer.cs	Merge branch 'develop' into feature/backup.core	2021-09-05 12:50:05 +03:00
BackupResource.resx	backup.core: move backup.core	2021-09-02 15:41:54 +03:00