pavelbannov
f52f32a6af
# Conflicts: # common/ASC.Core.Common/EF/Context/BaseDbContext.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs # common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs # common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs # common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs # common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs # common/Tools/ASC.Migration.Creator/Program.cs # common/Tools/ASC.Migration.Runner/Program.cs # common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs # common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs |
||
---|---|---|
.. | ||
includes | ||
sites-enabled | ||
batch.js | ||
onlyoffice-client.conf | ||
onlyoffice-login.conf | ||
onlyoffice-story.conf | ||
onlyoffice.conf | ||
proxy-frontend-virt.conf | ||
proxy-frontend.conf |