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
..
Settings	api-defaultvalue: add JsonPropertyNames	2020-07-09 18:37:36 +03:00
Skins	Added DIHelper	2020-02-17 11:58:14 +03:00
ColorThemesSettings.cs	Fix License	2020-07-08 18:30:23 +03:00
CommonLinkUtility.cs	Wizard: api	2020-07-02 17:11:59 +03:00
IFileUploadHandler.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
PasswordSettings.cs	Fix License	2020-07-08 18:30:23 +03:00
SearchHandlerManager.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
TenantExtra.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
TenantLogoHelper.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
TenantStatisticsProvider.cs	Added DIHelper	2020-02-17 11:58:14 +03:00
TransferResourceHelper.cs	IDE0066	2019-08-15 18:13:25 +03:00
UrlShortener.cs	UrlShortener: fix	2020-05-22 13:58:12 +03:00
UrlSwitcher.cs	Code Cleanup	2019-08-15 15:04:42 +03:00