pavelbannov 18a2c0a53d Merge branch 'develop' into feature/dotnet5 ... # Conflicts: # common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs # common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs # common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs # common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs # common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs # common/ASC.Core.Common/EF/Model/DbipLocation.cs # common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs # common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs # common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs # common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs # common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs # common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs # common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs # common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs # common/ASC.Core.Common/EF/Model/Resource/ResData.cs # common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs # common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs # common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs # common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs # common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs # common/ASC.Core.Common/EF/Model/User/UserPhoto.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs # common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs # common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs # common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs # products/ASC.Files/Core/Core/EF/DbFilesTag.cs # products/ASC.Files/Core/Core/EF/FilesDbContext.cs		2021-03-25 21:50:09 +03:00
..
AccountLinkContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
CoreDbContextMySql	Merge branch 'develop' into feature/dotnet5	2021-03-25 21:50:09 +03:00
DbContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
FeedDbContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
FilesDbContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
MailDbContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
MessagesContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
NotifyDbContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
ResourceDbContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
TelegramDbContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
TenantDbContextMySql	Merge branch 'develop' into feature/dotnet5	2021-03-25 21:50:09 +03:00
UserDbContextMySql	fix	2021-03-16 12:53:06 +03:00
VoipDbContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00
WebstudioDbContextMySql	update migrations ef tools v.5.0.3	2021-03-09 20:56:57 +03:00