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
..
Builder.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
FileData.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
FileDataProvider.cs	Fix Context in ASC.Files.Core, Update Migrations in ASC.Files.Core, ASC.Files.Test	2021-08-04 14:10:06 +03:00
Launcher.cs	Thumbnail: optimization	2021-08-10 17:54:56 +03:00
Service.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
ThumbnailSettings.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
Worker.cs	fix warnings	2021-08-11 21:00:43 +03:00