pavelbannov
3a747ef8e4
# Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Api.Core/Core/ApiDateTime.cs # common/ASC.Api.Core/Model/EmployeeWraper.cs # common/ASC.Api.Core/Model/EmployeeWraperFull.cs # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.People/Server/Models/GroupWrapperFull.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Api/Models/BuildVersion.cs |
||
---|---|---|
.. | ||
GroupModel.cs | ||
GroupWrapperFull.cs | ||
MemberModel.cs | ||
SetManagerModel.cs | ||
ThumbnailsDataWrapper.cs | ||
ThumbnailsModel.cs | ||
TransferGroupMembersModel.cs | ||
UpdateMembersModel.cs | ||
UploadPhotoModel.cs |