Commit Graph

5 Commits

Author SHA1 Message Date
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
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
a66f99f574 net5.0 2020-11-15 18:55:57 +03:00
237709f8f3 Thumb: fix 2020-06-26 10:53:52 +03:00
SuhorukovAnton
5fbe80d32a Thumbnails: first version 2020-06-16 14:55:46 +03:00