pavelbannov c9a32c05dc Merge branch 'develop' into feature/connect-controlPanel ... # Conflicts: # web/ASC.Web.Api/Controllers/PortalController.cs		2020-11-02 13:56:52 +03:00
..
AuthenticationController.cs	/api/2.0/authentication: application/x-www-form-urlencoded	2020-11-01 17:14:20 +03:00
CapabilitiesController.cs	Added /api/2.0/capabilities.json	2020-10-31 17:11:45 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	Removed sq bugs and code smells	2020-10-16 16:21:59 +03:00
PortalController.cs	Merge branch 'develop' into feature/connect-controlPanel	2020-11-02 13:56:52 +03:00
SecurityController.cs	connect-controlPanel: fix audit/login events and fix whitelabel	2020-10-21 12:55:13 +03:00
SettingsController.cs	connect-controlPanel: fix branding, backup and restore	2020-10-28 16:21:24 +03:00
SmtpSettingsController.cs	Removed sq bugs and code smells	2020-10-16 16:21:59 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00