pavelbannov b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop ... # Conflicts: # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/Core/ITenantService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Data.Storage/StorageHandler.cs # common/ASC.FederatedLogin/ASC.FederatedLogin.csproj # config/appsettings.json # config/nlog.config # migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs # packages/client/src/pages/Confirm/sub-components/createUser.js # packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js # packages/common/components/MoreLoginModal/index.tsx # packages/login/src/client/components/sub-components/LoginForm.tsx # products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.People/Server/Api/ThirdpartyController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Api/Core/CspSettingsHelper.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs # yarn.lock		2023-09-25 10:53:06 +03:00
..
client	Merge branch 'hotfix/v1.1.3' into develop	2023-09-25 10:53:06 +03:00
common	Merge branch 'hotfix/v1.1.3' into develop	2023-09-25 10:53:06 +03:00
components	Merge branch 'develop' into feature/document-service-location	2023-09-21 13:38:25 +04:00
editor	added translations	2023-09-07 18:40:17 +03:00
login	Merge branch 'hotfix/v1.1.3' into develop	2023-09-25 10:53:06 +03:00
auto-changelog-2.3.1.tgz