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 |
||
---|---|---|
.. | ||
AzRecord.cs | ||
DBResourceManager.cs | ||
EmployeeActivationStatus.cs | ||
EmployeeStatus.cs | ||
EmployeeType.cs | ||
Group.cs | ||
GroupInfo.cs | ||
IAzService.cs | ||
IncludeType.cs | ||
IQuotaService.cs | ||
ISubscriptionService.cs | ||
ITenantService.cs | ||
IUserService.cs | ||
Partner.cs | ||
PartnerDisplayType.cs | ||
PartnerPaymentMethod.cs | ||
PartnerStatus.cs | ||
PartnerType.cs | ||
SubscriptionMethod.cs | ||
UserGroupRef.cs | ||
UserGroupRefDictionary.cs | ||
UserGroupRefType.cs | ||
UserInfo.cs |