pavelbannov 72ae1f5e9b Merge branch 'master' into feature/Wizard ... # Conflicts: # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Common/src/api/settings/index.js		2020-07-31 16:49:54 +03:00
..
AuthenticationController.cs	Wizard: api	2020-07-02 17:11:59 +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	Merge branch 'master' into feature/backup	2020-06-25 19:21:42 +03:00
SettingsController.cs	Merge branch 'master' into feature/Wizard	2020-07-31 16:49:54 +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