Tatiana Lopaeva bec4f11dcd Merge branch 'develop' into feature/stripe ... # Conflicts: # common/ASC.Api.Core/Extensions/HostBuilderExtension.cs # common/services/ASC.Notify/Program.cs # common/services/ASC.Studio.Notify/Program.cs # common/services/ASC.Webhooks.Service/Program.cs # packages/common/components/Loaders/index.js # packages/common/store/AuthStore.js # packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx # packages/login/webpack.config.js # products/ASC.Files/Service/Program.cs # web/ASC.Web.Api/Program.cs		2022-09-15 17:16:04 +03:00
..
Api	Merge branch 'develop' into feature/stripe	2022-09-15 17:16:04 +03:00
ApiModels	Files: removed .result	2022-08-12 16:26:57 +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	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
appsettings.json	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
ASC.People.csproj	Merge branch 'develop' into feature/docspace	2022-06-20 12:15:08 +03:00
GlobalUsings.cs	backend: refactoring start application	2022-09-06 11:29:01 +03:00
PeopleProduct.cs	IDE1006	2022-03-25 19:26:06 +03:00
Program.cs	backend: refactoring start application	2022-09-06 11:29:01 +03:00
Startup.cs	backend: refactoring start application	2022-09-06 11:29:01 +03:00