pavelbannov
7af929fee8
# Conflicts: # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs # products/ASC.People/Server/Controllers/PeopleController.cs # products/ASC.People/Server/Models/MemberModel.cs # web/ASC.Web.Api/Controllers/SettingsController.cs |
||
---|---|---|
.. | ||
DarkThemeSettingsRequestDto.cs | ||
GroupRequestDto.cs | ||
LinkAccountRequestDto.cs | ||
MemberRequestDto.cs | ||
RegisterPersonalUserRequestDto.cs | ||
SetManagerRequestDto.cs | ||
StartReassignRequestDto.cs | ||
TerminateRequestDto.cs | ||
ThumbnailsRequestDto.cs | ||
TransferGroupMembersRequestDto.cs | ||
UpdateMembersRequestDto.cs | ||
UploadPhotoRequestDto.cs |