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
..
DbButton.cs	revert discard	2020-10-12 22:39:23 +03:00
DbQuota.cs	revert discard	2020-10-12 22:39:23 +03:00
DbQuotaRow.cs	fix warnings	2020-11-17 13:47:17 +03:00
DbTariff.cs	fix warnings	2020-11-17 13:47:17 +03:00
DbTenant.cs	Merge branch 'develop' into feature/dotnet5	2020-12-04 11:59:10 +03:00
DbTenantForbiden.cs	revert discard	2020-10-12 22:39:23 +03:00
DbTenantPartner.cs	fix save tenant	2020-12-23 18:36:05 +03:00
DbTenantVersion.cs	Code cleanup	2020-11-17 13:00:01 +03:00
TenantIpRestrictions.cs	fix warnings	2020-11-17 13:47:17 +03:00