pavelbannov 2c1d473314 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 # products/ASC.Files/Server/Controllers/FilesController.cs		2020-09-28 12:29:33 +03:00
..
ASC.ApiSystem	moved from release/11 4414f77b	2020-09-18 10:59:23 +03:00
ASC.Data.Backup	Merge branch 'master' into feature/release-11.0.0	2020-09-23 14:00:24 +03:00
ASC.Data.Storage.Encryption	Api: fix	2020-09-23 13:55:39 +03:00
ASC.Data.Storage.Migration	Migration: fix start	2020-08-28 18:30:26 +03:00
ASC.ElasticSearch	enctyption: remove bug	2020-09-16 11:10:16 +03:00
ASC.Feed.Aggregator	scope: refactoring	2020-09-07 15:01:15 +03:00
ASC.Notify	Merge branch 'master' into feature/release-11.0.0	2020-09-20 20:17:12 +03:00
ASC.Socket.IO.Svc	Encryption: first version	2020-09-02 13:54:50 +03:00
ASC.Studio.Notify	private: firtst version	2020-08-12 12:58:08 +03:00
ASC.TelegramService	Telegram: fix Kafka	2020-09-25 14:13:43 +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