pavelbannov
7af929fee8
# Conflicts: # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs # products/ASC.People/Server/Controllers/PeopleController.cs # products/ASC.People/Server/Models/MemberModel.cs # web/ASC.Web.Api/Controllers/SettingsController.cs |
||
---|---|---|
.. | ||
nginx | ||
appsettings.json | ||
appsettings.services.json | ||
appsettings.test.json | ||
autofac.consumers.json | ||
autofac.json | ||
autofac.products.json | ||
backup.json | ||
elastic.json | ||
elastic.test.json | ||
kafka.json | ||
kafka.test.json | ||
nlog.config | ||
notify.json | ||
rabbitmq.json | ||
rabbitmq.test.json | ||
radicale.config | ||
radicale.log.config | ||
radicale.rights | ||
redis.json | ||
redis.test.json | ||
socket.json | ||
socket.test.json | ||
ssoauth.json | ||
storage.json | ||
thumb.json | ||
thumb.test.json | ||
urlshortener.test.json | ||
workbox-config.js | ||
workbox-dev-config.js |