pavelbannov 34bda20eb0 Merge branch 'develop' into feature/recalculate-user-quota ... # Conflicts: # products/ASC.People/Server/Api/UserController.cs		2022-11-02 13:40:53 +03:00
..
ApiControllerBase.cs	added new license headers	2022-03-15 21:00:53 +03:00
ContactsController.cs	Files: removed .result	2022-08-12 16:26:57 +03:00
GroupController.cs	Files: removed .result	2022-08-12 16:26:57 +03:00
NotificationController.cs	Merge branch 'develop' into feature/stripe	2022-09-23 16:11:23 +03:00
PeopleControllerBase.cs	People: fix	2022-08-15 14:30:50 +03:00
PhotoController.cs	refactoring	2022-09-15 18:58:05 +03:00
ReassignController.cs	refactor	2022-10-18 14:22:02 +03:00
RemoveUserDataController.cs	refactoring	2022-09-15 18:58:05 +03:00
ThirdpartyController.cs	refactor	2022-10-18 14:22:02 +03:00
UserController.cs	Merge branch 'develop' into feature/recalculate-user-quota	2022-11-02 13:40:53 +03:00