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
..
ASC.Calendar/Server	Web: Removed ASC.Calendar/Client	2022-07-31 13:14:59 +03:00
ASC.CRM	Web: Removed ASC.CRM/Client	2022-07-31 13:15:29 +03:00
ASC.Files	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
ASC.Mail/Server	Web: Removed ASC.Mail/Client	2022-07-31 13:15:59 +03:00
ASC.People/Server	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
ASC.Projects/Server	Web: Removed ASC.Projects/Client	2022-07-31 13:16:31 +03:00