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 |
||
---|---|---|
.. | ||
Caching | ||
Collections | ||
Data | ||
DependencyInjection | ||
Geolocation | ||
Logging | ||
Module | ||
Notify | ||
Properties | ||
protos | ||
Security | ||
Tests | ||
Threading | ||
Utils | ||
Web | ||
ASC.Common.csproj | ||
ASC.Common.sln | ||
DIHelper.cs |