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
..
DbBackupProvider.cs	analizators/U2U1209	2022-01-19 11:59:14 +03:00
DbHelper.cs	fixed warnings	2022-02-07 20:19:58 +03:00
FileBackupProvider.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
IBackupProvider.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
IDataOperator.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
NotifyHelper.cs	Merge branch 'develop' into feature/backup	2022-02-09 12:40:16 +03:00
Schedule.cs	backup.core: move backup.core	2021-09-02 15:41:54 +03:00
ZipOperator.cs	analizators/s1450	2022-01-21 16:15:29 +03:00