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
..
Context	removed DbUsersQuotaRow	2022-10-07 16:37:57 +03:00
Model	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
CustomSqlGenerator.cs	suppress warning	2022-08-01 13:41:33 +03:00
FireBaseUser.cs	Firebase: model	2022-08-23 20:03:02 +03:00
IQueryableExtensions.cs	added new license headers	2022-03-15 21:00:53 +03:00
JsonExtensions.cs	added new license headers	2022-03-15 21:00:53 +03:00
LinqExtensions.cs	added new license headers	2022-03-15 21:00:53 +03:00