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
..
ASC.ApiSystem	DI: refactoring	2020-07-17 13:52:28 +03:00
ASC.Data.Backup	DI: refactoring	2020-07-17 13:52:28 +03:00
ASC.ElasticSearch	Merge branch 'master' into feature/files	2020-07-17 17:48:50 +03:00
ASC.Feed.Aggregator	Feed: FilesModule	2020-06-04 13:54:13 +03:00
ASC.Notify	Notify: fix	2020-06-29 19:15:18 +03:00
ASC.Studio.Notify	Revert logger	2020-06-04 16:46:58 +03:00
ASC.Thumbnails.Svc	Thumb: fix	2020-06-26 12:40:46 +03:00
ASC.UrlShortener.Svc	Revert logger	2020-06-04 16:46:58 +03:00