Tatiana Lopaeva 9154b971c0 Merge branch 'develop' into feature/stripe ... # Conflicts: # packages/client/src/pages/PortalSettings/index.js # packages/common/api/settings/index.js # packages/common/components/Loaders/index.js		2022-08-29 13:06:44 +03:00
..
IntegrationEvents/EventHandling	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +03:00
Log	moved from ddf515b8	2022-06-02 15:42:45 +03:00
Properties	BackupBackgroundTasks: port changed	2022-04-13 19:13:37 +03:00
Services	Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController	2022-08-25 23:09:12 +03:00
appsettings.json	add support rabbitmq. split ASC.Data.Backup service on two services	2022-02-04 20:44:03 +03:00
ASC.Data.Backup.BackgroundTasks.csproj	merge from feature/backend-refactor	2022-03-29 23:29:03 +03:00
GlobalUsings.cs	add "AddBaseDbContextPool"	2022-08-12 15:06:49 +03:00
Program.cs	add "AddBaseDbContextPool"	2022-08-12 15:06:49 +03:00
Startup.cs	moved from ddf515b8	2022-06-02 15:42:45 +03:00