pavelbannov
d1f7d41a57
# Conflicts: # common/ASC.Api.Core/GlobalUsings.cs # common/ASC.Core.Common/EF/Context/MessagesContext.cs # common/ASC.MessagingSystem/DbSender/MessagesRepository.cs # common/services/ASC.AuditTrail/AuditEventsRepository.cs # common/services/ASC.AuditTrail/LoginEventsRepository.cs # common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs # common/services/ASC.AuditTrail/Mappers/CrmActionMapper.cs # common/services/ASC.AuditTrail/Mappers/DocumentsActionMapper.cs # common/services/ASC.AuditTrail/Mappers/LoginActionMapper.cs # common/services/ASC.AuditTrail/Mappers/OthersActionMapper.cs # common/services/ASC.AuditTrail/Mappers/PeopleActionMapper.cs # common/services/ASC.AuditTrail/Mappers/ProjectsActionMapper.cs # common/services/ASC.AuditTrail/Mappers/SettingsActionMapper.cs # common/services/ASC.ClearEvents/ClearEventsServiceLauncher.cs |
||
---|---|---|
.. | ||
Auth | ||
Convention | ||
Core | ||
Middleware | ||
Model | ||
Routing | ||
ASC.Api.Core.csproj | ||
GlobalUsings.cs |