Alexey Bannov a9e93ef2f9 fixed merge conflicts		2023-09-13 09:28:08 +03:00
..
ApiControllerBase.cs	people: added api descriptions	2023-04-04 18:34:54 +03:00
ContactsController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
GroupController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
NotificationController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
PeopleControllerBase.cs	fix await using	2023-06-01 14:27:27 +03:00
PhotoController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ReassignController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
RemoveUserDataController.cs	Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop	2023-08-01 17:07:05 +03:00
ThirdpartyController.cs	Merge branch 'hotfix/v1.1.2' into develop	2023-08-28 18:53:10 +03:00
UserController.cs	fixed merge conflicts	2023-09-13 09:28:08 +03:00