pavelbannov 15ba6828c5 Merge branch 'master' into feature/files ... # Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/FileStorageService.cs		2020-08-20 12:43:12 +03:00
..
Attributes	Elastic: removed unused classes	2020-05-08 17:04:05 +03:00
Core	private: firtst version	2020-08-12 12:58:08 +03:00
Engine	private: firtst version	2020-08-12 12:58:08 +03:00
protos	ElasticSearch: state	2020-05-06 14:32:26 +03:00
Service	private: firtst version	2020-08-12 12:58:08 +03:00
ASC.ElasticSearch.csproj	Merge branch 'master' into feature/files	2020-06-29 09:53:07 +03:00