AlexeySafronov bedfad1ec5 Merge branch 'master' into develop ... # Conflicts: # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Client/src/pages/Home/Section/Header/index.js # products/ASC.Files/Client/src/store/DialogsStore.js # products/ASC.Files/Client/src/store/FilesActionsStore.js # products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs # products/ASC.Files/Core/Core/EF/FilesDbContext.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Server/DocStore # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Tfa/TfaManager.cs		2021-12-28 18:21:44 +03:00
..
AdditionalWhiteLabelSettings.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
CompanyWhiteLabelSettings.cs	moved from 043e301	2021-11-16 20:40:15 +03:00
TenantInfoSettings.cs	net6: replacing System.Drawing with ImageSharp	2021-10-18 14:24:05 +03:00
TenantLogoManager.cs	moved from 51eb3d88	2021-12-07 16:56:16 +03:00
TenantWhiteLabelSettings.cs	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
WhiteLabelLogoTypeEnum.cs	moved from 51eb3d88	2021-12-07 16:56:16 +03:00