pavelbannov 79ea471098 Merge branch 'develop' into refactoring/scope ... # Conflicts: # common/ASC.Api.Core/Core/BaseStartup.cs # common/ASC.Core.Common/BaseCommonLinkUtility.cs # common/services/ASC.ApiSystem/Startup.cs # common/services/ASC.Data.Backup/BackupServiceLauncher.cs # common/services/ASC.Data.Backup/Startup.cs # common/services/ASC.Data.Storage.Migration/Program.cs # common/services/ASC.Notify/NotifyServiceLauncher.cs # common/services/ASC.Notify/Program.cs # common/services/ASC.Socket.IO.Svc/Program.cs # common/services/ASC.Studio.Notify/Program.cs # common/services/ASC.Thumbnails.Svc/Program.cs # common/services/ASC.UrlShortener.Svc/Program.cs # products/ASC.Files/Core/Configuration/ProductEntryPoint.cs # products/ASC.Files/Server/Startup.cs # products/ASC.Files/Service/Program.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Startup.cs # web/ASC.Web.Studio/Startup.cs		2020-11-04 15:22:43 +03:00
..
Attributes	Elastic: removed unused classes	2020-05-08 17:04:05 +03:00
Core	Scope: refactoring	2020-10-19 18:53:15 +03:00
Engine	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
protos	ElasticSearch: state	2020-05-06 14:32:26 +03:00
Service	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.ElasticSearch.csproj	Merge branch 'master' into feature/files	2020-10-16 16:57:21 +03:00