pavelbannov ea4fa97838 Merge branch 'develop' into feature/wizard/migration ... # Conflicts: # ASC.Tests.sln # common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs # common/ASC.Data.Backup.Core/Core/DbHelper.cs # common/ASC.Data.Backup.Core/Storage/BackupRepository.cs # common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj # common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj # common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj		2021-09-15 15:52:13 +03:00
..
DbMessageSender.cs	Scope: refactoring	2020-10-20 16:24:46 +03:00
MessagesRepository.cs	Merge branch 'develop' into feature/wizard/migration	2021-09-15 15:52:13 +03:00