pavelbannov 4dbf1e70b7 Merge branch 'develop' into feature/stripe ... # Conflicts: # common/ASC.ActiveDirectory/GlobalUsings.cs # common/ASC.Data.Storage/StorageFactory.cs # common/ASC.Data.Storage/TenantQuotaController.cs # migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs # packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Core/PublicResources/Resource.resx # web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs		2022-10-10 19:16:03 +03:00
..
Base	Quota: fix	2022-10-06 15:55:47 +03:00
ComplexOperations	refactoring	2022-09-14 14:21:25 +03:00
Log	fix static, braces, log	2022-06-15 15:39:37 +03:00
Novell	fix static, braces, log	2022-06-15 15:39:37 +03:00
ASC.ActiveDirectory.csproj	fix	2022-03-22 13:37:44 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
LdapUserManager.cs	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
LdapUtils.cs	fix static, braces, log	2022-06-15 15:39:37 +03:00