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
..
ASC.ApiCache	fixed ArgumentOutOfRangeException	2023-08-04 17:42:14 +03:00
ASC.ApiSystem	Merge branch 'hotfix/v1.1.2' into develop	2023-08-28 18:53:10 +03:00
ASC.AuditTrail	Merge branch 'develop' into feature/region-audit	2023-08-21 12:51:52 +03:00
ASC.ClearEvents	fixed ArgumentOutOfRangeException	2023-08-04 17:42:14 +03:00
ASC.Data.Backup	Merge branch 'hotfix/v1.1.2' into develop	2023-09-01 15:33:39 +03:00
ASC.Data.Backup.BackgroundTasks	fixed ArgumentOutOfRangeException	2023-08-04 17:42:14 +03:00
ASC.Data.Storage.Encryption	backend: updated some dll	2023-08-10 19:16:25 +03:00
ASC.ElasticSearch	backend: updated some dll	2023-08-10 19:16:25 +03:00
ASC.Feed.Aggregator	Merge branch 'develop' into feature/delete-portal	2023-06-08 15:53:31 +03:00
ASC.Notify	fixed ArgumentOutOfRangeException	2023-08-04 17:42:14 +03:00
ASC.Studio.Notify	fixed ArgumentOutOfRangeException	2023-08-04 17:42:14 +03:00
ASC.TelegramService	Merge branch 'master' into develop	2023-07-18 19:26:32 +03:00