pavelbannov f252ef2a7f Merge branch 'master' into features/ASC.AuditTrail ... # Conflicts: # ASC.Web.sln		2020-10-13 18:17:59 +03:00
..
AuthenticationController.cs	Api: fix DI	2020-10-13 11:09:22 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	Api: fix DI	2020-10-13 11:11:03 +03:00
PortalController.cs	revert discard	2020-10-12 22:39:23 +03:00
SecurityController.cs	ASC.AuditTrail: fix	2020-10-06 15:12:57 +03:00
SettingsController.cs	Merge branch 'master' into feature/fix_API_return	2020-10-13 13:33:24 +03:00
SmtpSettingsController.cs	Api: fix DI	2020-10-13 11:13:24 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00