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
..
Configuration	Refactoting & optimization	2020-11-24 13:15:11 +03:00
Modules	fix	2020-08-27 17:01:37 +03:00
Service	MemoryCache -> IMemoryCache	2021-01-12 20:51:14 +03:00
ASC.Feed.Aggregator.csproj	net5.0	2020-11-15 18:55:57 +03:00