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 |
||
---|---|---|
.. | ||
nginx | ||
activemq.test.json | ||
apicache.json | ||
apisystem.dev.json | ||
apisystem.json | ||
appsettings.dev.json | ||
appsettings.json | ||
appsettings.services.json | ||
appsettings.test.json | ||
autofac.consumers.json | ||
autofac.json | ||
autofac.products.json | ||
backup.json | ||
elastic.json | ||
elastic.test.json | ||
feed.json | ||
kafka.json | ||
kafka.test.json | ||
nlog.config | ||
notify.json | ||
plugins.json | ||
rabbitmq.json | ||
rabbitmq.test.json | ||
radicale.config | ||
radicale.log.config | ||
radicale.rights | ||
redis.json | ||
socket.json | ||
socket.test.json | ||
ssoauth.json | ||
storage.json | ||
thumb.json | ||
thumb.test.json | ||
urlshortener.test.json |