Vashchuk Nikita 6507c4b999 Merge branch 'develop' into feature/migrations-fix ... # Conflicts: # products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs # web/ASC.Web.Core/GlobalUsings.cs		2022-07-14 11:56:07 +03:00
..
DbButton.cs	fix Contexts,	2022-07-08 14:24:18 +03:00
DbQuota.cs	changed int type to tinyint(1) for bool	2022-07-11 18:31:00 +03:00
DbQuotaRow.cs	fix Contexts,	2022-07-08 14:24:18 +03:00
DbTariff.cs	fix Contexts,	2022-07-08 14:24:18 +03:00
DbTenant.cs	Merge branch 'develop' into feature/migrations-fix	2022-07-14 11:56:07 +03:00
DbTenantForbiden.cs	fix Contexts,	2022-07-08 14:24:18 +03:00
DbTenantPartner.cs	fix Contexts,	2022-07-08 14:24:18 +03:00
DbTenantVersion.cs	changed int type to tinyint(1) for bool	2022-07-11 18:31:00 +03:00
TenantIpRestrictions.cs	fix Contexts,	2022-07-08 14:24:18 +03:00