pavelbannov 29d9f21d05 Merge branch 'master' into feature/files ... # Conflicts: # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # web/ASC.Web.Core/Files/DocumentService.cs		2020-08-31 17:45:57 +03:00
..
ASC.ApiSystem	fix	2020-08-27 17:01:37 +03:00
ASC.Data.Backup	fix	2020-08-27 17:01:37 +03:00
ASC.Data.Storage.Migration	Migration: fix start	2020-08-28 18:30:26 +03:00
ASC.ElasticSearch	Merge branch 'master' into feature/files	2020-08-20 12:43:12 +03:00
ASC.Feed.Aggregator	fix	2020-08-27 17:01:37 +03:00
ASC.Notify	fix	2020-08-27 17:01:37 +03:00
ASC.Socket.IO.Svc	fix	2020-08-27 17:01:37 +03:00
ASC.Studio.Notify	private: firtst version	2020-08-12 12:58:08 +03:00
ASC.Thumbnails.Svc	fix	2020-08-27 17:01:37 +03:00
ASC.UrlShortener.Svc	private: firtst version	2020-08-12 12:58:08 +03:00