pavelbannov
e01ee037f2
# Conflicts: # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/EF/Context/BaseDbContext.cs # common/ASC.Core.Common/EF/Context/CoreDbContext.cs # common/ASC.Core.Common/EF/Context/DbContext.cs # common/ASC.Core.Common/EF/Context/DbContextManager.cs # common/ASC.Core.Common/EF/Context/FeedDbContext.cs # common/ASC.Core.Common/EF/Context/FilesDbContext.cs # common/ASC.Core.Common/EF/Context/MessagesContext.cs # common/ASC.Core.Common/EF/Context/ResourceDbContext.cs # common/ASC.Core.Common/EF/Context/TelegramDbContext.cs # common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs # common/ASC.Core.Common/EF/Model/AccountLinks.cs # common/ASC.Core.Common/EF/Model/Core/Acl.cs # common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs # common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs # common/ASC.Core.Common/EF/Model/Core/Subscription.cs # common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs # common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs # common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs # common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs # common/ASC.Core.Common/EF/Model/FilesConverts.cs # common/ASC.Core.Common/EF/Model/MobileAppInstall.cs # common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs # common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs # common/ASC.Core.Common/EF/Model/TelegramUser.cs # common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs # common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs # common/ASC.Core.Common/EF/Model/User/UserGroup.cs # common/ASC.Core.Common/HostedSolution.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # common/ASC.Data.Reassigns/QueueWorker.cs # common/ASC.Data.Reassigns/ReassignProgressItem.cs # common/ASC.Data.Reassigns/RemoveProgressItem.cs # common/ASC.VoipService/Dao/CachedVoipDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/EF/DbEncryptedData.cs # products/ASC.Files/Core/Core/EF/DbFile.cs # products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs # products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs # products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs # products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs # products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs # products/ASC.Files/Core/Core/EF/DbFolderTree.cs # products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs # products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs # products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Server/Startup.cs # web/ASC.Web.Studio/Startup.cs |
||
---|---|---|
.. | ||
ASC.Api.Core | ||
ASC.Common | ||
ASC.Core.Common | ||
ASC.Data.Reassigns | ||
ASC.Data.Storage | ||
ASC.FederatedLogin | ||
ASC.Feed | ||
ASC.IPSecurity | ||
ASC.MessagingSystem | ||
ASC.Notify.Textile | ||
ASC.Resource.Manager | ||
ASC.Socket.IO | ||
ASC.Textile | ||
ASC.Thumbnails | ||
ASC.UrlShortener | ||
ASC.VoipService | ||
services |