Alexey Safronov f07aa0a183 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs # config/nginx/onlyoffice.conf # packages/asc-web-common/constants/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js		2022-02-25 16:05:43 +03:00
..
Api	backup: add api method enableAutoBackup	2022-02-09 17:39:02 +03:00
ApiModels	backup: refactoring	2022-01-19 19:25:10 +03:00
Properties	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
Services	backup: refactoring	2022-01-19 19:25:10 +03:00
appsettings.json	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
ASC.Data.Backup.csproj	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00
GlobalUsings.cs	fixed warnings	2022-02-07 20:19:58 +03:00
Program.cs	Merge branch 'develop' into feature/analizators	2022-01-31 14:35:16 +03:00
Startup.cs	backup: add in startup backupFileUpload.ashx	2022-02-10 11:01:51 +03:00