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
..
BackupRepository.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
BackupStorageFactory.cs	backup: refactoring	2022-01-18 19:04:35 +03:00
ConsumerBackupStorage.cs	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +03:00
DataStoreBackupStorage.cs	async IDataStore	2022-01-25 12:29:11 +03:00
DocumentsBackupStorage.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
IBackupRepository.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
IBackupStorage.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
LocalBackupStorage.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
S3BackupStorage.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00