AlexeySafronov 7f095f03d1 Merge branch 'master' into feature/Wizard ... # Conflicts: # common/ASC.Resource.Manager/Startup.cs # config/kafka.json # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx # web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx # web/ASC.Web.Core/TariffSettings.cs		2020-07-15 15:23:28 +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	added api methods	2020-07-08 11:29:44 +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