pavelbannov de16476542 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Core.Common/Context/SecurityContext.cs # products/ASC.People/Server/Controllers/PeopleController.cs # web/ASC.Web.Core/Users/UserPhotoManager.cs		2019-09-16 15:35:44 +03:00
..
Contact.cs	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
EmployeeWraperFull.cs	Merge branch 'master' into refactoring/di	2019-09-16 15:35:44 +03:00
GroupWrapperFull.cs	revert f85711b736	2019-09-12 14:34:58 +03:00
MemberModel.cs	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
ThumbnailsDataWrapper.cs	revert f85711b736	2019-09-12 14:34:58 +03:00
ThumbnailsModel.cs	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
UpdateMembersModel.cs	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
UploadPhotoModel.cs	web: People: creating a user avatar	2019-09-13 14:41:15 +03:00