pavelbannov 3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop ... # Conflicts: # common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs # migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs # packages/client/src/components/panels/SelectFileDialog/index.js # packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js # packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js # packages/client/src/store/ProfileActionsStore.js # packages/common/api/files/index.js # packages/common/store/AuthStore.js # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # yarn.lock		2023-09-01 15:33:39 +03:00
..
AdditionalWhiteLabelSettings.cs	Merge branch 'hotfix/v1.1.2' into develop	2023-09-01 15:33:39 +03:00
CompanyWhiteLabelSettings.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
TenantInfoSettings.cs	async refactoring	2023-05-19 14:42:02 +03:00
TenantLogoManager.cs	fix await using	2023-06-01 14:27:27 +03:00
TenantWhiteLabelSettings.cs	Merge branch 'hotfix/v1.1.2' into develop	2023-08-28 18:53:10 +03:00
WhiteLabelLogoTypeEnum.cs	changed notification image format to png,	2023-03-23 00:25:15 +05:00