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 |
||
---|---|---|
.. | ||
ASC.ActiveDirectory | ||
ASC.Api.Core | ||
ASC.Common | ||
ASC.Core.Common | ||
ASC.Data.Backup.Core | ||
ASC.Data.Encryption | ||
ASC.Data.Reassigns | ||
ASC.Data.Storage | ||
ASC.EventBus | ||
ASC.EventBus.Extensions.Logger | ||
ASC.EventBus.RabbitMQ | ||
ASC.FederatedLogin | ||
ASC.Feed | ||
ASC.IPSecurity | ||
ASC.MessagingSystem | ||
ASC.Migration | ||
ASC.Notify.Textile | ||
ASC.Resource.Manager | ||
ASC.Socket.IO | ||
ASC.SsoAuth | ||
ASC.Textile | ||
ASC.Thumbnails | ||
ASC.UrlShortener | ||
ASC.VoipService | ||
ASC.WebDav | ||
ASC.Webhooks.Core | ||
services | ||
Tests | ||
Tools/AutoMigrationCreator |