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
..
Api	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
ApiModels	Merge branch 'develop' into feature/user-quota	2022-09-23 17:15:49 +03:00
Log	Log: refactoring	2022-05-26 12:01:54 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
Resources	Merge branch 'release/v1.2' into develop	2022-06-19 22:44:48 +03:00
.gitignore
appsettings.json
ASC.People.csproj	Merge branch 'develop' into feature/docspace	2022-06-20 12:15:08 +03:00
GlobalUsings.cs	Merge branch 'develop' into feature/stripe	2022-10-10 19:16:03 +03:00
PeopleProduct.cs	IDE1006	2022-03-25 19:26:06 +03:00
Program.cs	nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property	2022-09-15 17:44:04 +03:00
Startup.cs	Payment: UsersInRoomStatistic	2022-09-20 23:22:27 +03:00