pavelbannov 7f1d946269 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/Shell.jsx # packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js # packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js # packages/client/src/pages/PortalSettings/index.js # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Core/HttpHandlers/SsoHandler.cs		2022-09-23 16:11:23 +03:00
..
Api	Merge branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00
ApiModels	Payment: rename	2022-09-19 18:20:21 +03:00
Core	Merge branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00
img	Api: Changed icons.	2022-08-30 16:25:24 +03:00
Log	Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController	2022-08-25 23:09:12 +03:00
Mapping	Web.Api: added feed api	2022-09-01 18:22:40 +03:00
Properties	nlog: refactoring service name	2022-09-16 16:41:51 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	Merge branch 'develop' into feature/stripe	2022-09-15 17:16:04 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
GlobalUsings.cs	Api: payments check	2022-09-19 17:56:45 +03:00
Program.cs	Merge branch 'develop' into feature/stripe	2022-09-19 18:16:34 +03:00
Startup.cs	Api: payments check	2022-09-19 17:56:45 +03:00