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 |
||
---|---|---|
.. | ||
AuthenticationController.cs | ||
CapabilitiesController.cs | ||
LdapController.cs | ||
ModulesController.cs | ||
PortalController.cs | ||
SecurityController.cs | ||
SettingsController.cs | ||
SmtpSettingsController.cs | ||
SsoSettingsV2Controller.cs | ||
ThirdPartyController.cs |