pavelbannov f8be896241 Merge branch 'develop' into feature/dotnet5 ... # Conflicts: # common/ASC.Common/ASC.Common.csproj # common/ASC.Core.Common/ASC.Core.Common.csproj # common/ASC.Core.Common/EF/Context/BaseDbContext.cs # common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs		2021-01-22 16:34:40 +03:00
..
ASC.ApiSystem	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.AuditTrail	Code cleanup	2020-11-17 13:00:01 +03:00
ASC.Data.Backup	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.Data.Storage.Encryption	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.Data.Storage.Migration	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.ElasticSearch	Files: removed temp	2021-01-13 12:41:29 +03:00
ASC.Feed.Aggregator	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.Notify	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.Socket.IO.Svc	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.Studio.Notify	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.TelegramService	Merge branch 'develop' into feature/dotnet5	2020-11-17 11:31:14 +03:00
ASC.Thumbnails.Svc	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
ASC.UrlShortener.Svc	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00