pavelbannov
68483bc979
# Conflicts: # common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Startup.cs |
||
---|---|---|
.. | ||
GroupModel.cs | ||
GroupWrapperFull.cs | ||
LinkAccountModel.cs | ||
MemberModel.cs | ||
SetManagerModel.cs | ||
StartReassignModel.cs | ||
TerminateModel.cs | ||
ThumbnailsDataWrapper.cs | ||
ThumbnailsModel.cs | ||
TransferGroupMembersModel.cs | ||
UpdateMembersModel.cs | ||
UploadPhotoModel.cs |