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
..
ConfirmTypeEnum.cs	enum generator	2022-07-05 16:58:11 +03:00
Constants.cs	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
DarkThemeSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
DisplayUserNameFormat.cs	added new license headers	2022-03-15 21:00:53 +03:00
DisplayUserSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
PersonalQuotaSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
UserExtensions.cs	Api: payments check	2022-09-19 17:56:45 +03:00
UserFormatter.cs	added new license headers	2022-03-15 21:00:53 +03:00
UserQuotaSettings.cs	Quota: user quota storage core_user -> webstudio_settings	2022-09-15 15:38:31 +03:00