pavelbannov 986561d4e9 Merge branch 'develop' into feature/delete-portal ... # Conflicts: # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Caching/CachedQuotaService.cs # common/ASC.Core.Common/Caching/CachedTenantService.cs # common/ASC.Core.Common/Context/Impl/TenantManager.cs # common/ASC.Core.Common/Core/ITenantService.cs # common/ASC.Core.Common/Data/DbAzService.cs # common/ASC.Core.Common/Data/DbQuotaService.cs # common/ASC.Core.Common/Data/DbSubscriptionService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Core.Common/Data/DbUserService.cs # common/ASC.Core.Common/HostedSolution.cs # common/ASC.Data.Backup.Core/Core/DbHelper.cs # common/ASC.Data.Storage/TenantQuotaController.cs # common/ASC.Feed/Data/FeedAggregateDataProvider.cs # common/ASC.Feed/Data/FeedReadedDataProvider.cs # common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs # common/services/ASC.ApiSystem/Controllers/PeopleController.cs # migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs # migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs # products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs # products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs # products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs # products/ASC.People/Server/Api/ThirdpartyController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/ConnectionsController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/LicenseController.cs # web/ASC.Web.Core/HttpHandlers/SsoHandler.cs # web/ASC.Web.Core/Sms/SmsManager.cs # web/ASC.Web.Core/Tfa/TfaManager.cs		2023-06-08 15:53:31 +03:00
..
ASC.Migration.Core	Merge branch 'develop' into feature/asc.apicache	2023-02-07 17:07:20 +03:00
ASC.Migration.Creator	fix	2023-04-25 13:19:48 +03:00
ASC.Migration.Runner	ignore when migration repeated models	2023-04-25 12:27:07 +03:00
ASC.MigrationPersonalToDocspace	Merge branch 'develop' into feature/delete-portal	2023-06-08 15:53:31 +03:00