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
..
SmsKeyStorage.cs	refactoring	2022-04-15 12:08:06 +03:00
SmsManager.cs	Merge branch 'develop' into feature/two-factor-authentication	2022-10-09 21:32:14 +03:00
SmsProvider.cs	removed voip service	2022-07-15 18:46:52 +03:00
SmsSender.cs	Log: refactoring	2022-05-26 12:01:54 +03:00
StudioSmsNotificationSettings.cs	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
TfaSettingsBase.cs	refactoring	2022-10-10 14:55:22 +03:00