pavelbannov
68483bc979
# Conflicts: # common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/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 |