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
..
Billing	Files: fix	2020-07-13 15:57:39 +03:00
Caching	Merge branch 'master' into feature/system-json	2020-05-14 17:14:59 +03:00
Configuration	Files: search	2020-04-29 17:11:31 +03:00
Context	UserManager: fix	2020-06-17 12:53:12 +03:00
Core	Fix License	2020-07-08 18:30:23 +03:00
Data	Merge branch 'master' into feature/Wizard	2020-07-15 15:23:28 +03:00
EF	Merge branch 'master' into feature/Wizard	2020-07-15 15:23:28 +03:00
Notify	Fix License	2020-07-08 18:30:23 +03:00
Properties	Code Cleanup	2019-08-15 15:04:42 +03:00
protos	Backup: transfer to ASC.Data.Backup	2020-06-23 13:48:36 +03:00
Security	Wizard: api	2020-07-02 17:11:59 +03:00
Settings	Files: Index Service	2020-04-28 18:11:10 +03:00
Tenants	Fix License	2020-07-08 18:30:23 +03:00
Tests	api-defaultvalue: add System.Text.Json	2020-07-10 13:35:24 +03:00
Users	Merge branch 'master' into feature/Wizard	2020-07-15 15:23:28 +03:00
WhiteLabel	Fix License	2020-07-08 18:30:23 +03:00
ASC.Core.Common.csproj	References updated	2020-06-28 16:55:21 +03:00
BaseCommonLinkUtility.cs	Added Feed.Aggregator	2020-06-03 17:53:58 +03:00
GeolocationHelper.cs	EF: GeolocationHelper	2019-12-13 16:05:24 +03:00
HostedSolution.cs	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00
MultiRegionHostedSolution.cs	DI: HostedSolution	2020-02-20 11:05:10 +03:00