Tatiana Lopaeva 29abce027d Merge branch 'develop' into feature/notifications ... # Conflicts: # packages/client/src/pages/Accounts.jsx # packages/client/src/store/FilesActionsStore.js # packages/common/constants/index.js # products/ASC.People/Server/Api/UserController.cs		2023-03-06 15:37:45 +03:00
..
Api	Merge branch 'develop' into feature/notifications	2023-03-06 15:37:45 +03:00
ApiModels	People: added resending all invitations	2023-01-19 13:29:45 +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	Resources renamed	2023-01-18 18:53:09 +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 pull request #1149 from ONLYOFFICE/feature/dotnet7	2023-01-19 22:00:57 +03:00
GlobalUsings.cs	refactoring	2022-11-24 17:21:34 +03:00
PeopleProduct.cs	IDE1006	2022-03-25 19:26:06 +03:00
Program.cs	refactoring	2023-02-27 18:38:01 +03:00
Startup.cs	WebHooks: added resources, new methods and settings for disable webhook	2023-02-08 14:17:06 +03:00