pavelbannov
de16476542
# 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 |
||
---|---|---|
.. | ||
Contact.cs | ||
EmployeeWraperFull.cs | ||
GroupWrapperFull.cs | ||
MemberModel.cs | ||
ThumbnailsDataWrapper.cs | ||
ThumbnailsModel.cs | ||
UpdateMembersModel.cs | ||
UploadPhotoModel.cs |