AlexeySafronov d094546147 Merge branch 'master' into feature/files ... # Conflicts: # products/ASC.Files/Client/yarn.lock # products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/yarn.lock		2020-07-17 17:48:50 +03:00
..
Attributes	Elastic: removed unused classes	2020-05-08 17:04:05 +03:00
Core	DI: refactoring	2020-07-17 13:52:28 +03:00
Engine	DI: refactoring	2020-07-17 13:52:28 +03:00
protos	ElasticSearch: state	2020-05-06 14:32:26 +03:00
Service	ElasticSearch: state	2020-05-06 14:32:26 +03:00
ASC.ElasticSearch.csproj	Merge branch 'master' into feature/files	2020-06-29 09:53:07 +03:00