pavelbannov 3a747ef8e4 Merge branch 'master' into feature/system-json ... # Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Api.Core/Core/ApiDateTime.cs # common/ASC.Api.Core/Model/EmployeeWraper.cs # common/ASC.Api.Core/Model/EmployeeWraperFull.cs # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.People/Server/Models/GroupWrapperFull.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Api/Models/BuildVersion.cs		2020-05-07 10:28:20 +03:00
..
AuthenticationController.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
PortalController.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
SettingsController.cs	Merge branch 'master' into feature/system-json	2020-05-07 10:28:20 +03:00
SmtpSettingsController.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00