pavelbannov
de16476542
# Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Core.Common/Context/SecurityContext.cs # products/ASC.People/Server/Controllers/PeopleController.cs # web/ASC.Web.Core/Users/UserPhotoManager.cs |
||
---|---|---|
.. | ||
ApiContext.cs | ||
ApiDateTime.cs | ||
CustomEndpointDataSource.cs | ||
CustomJsonOptionsWrapper.cs | ||
ItemDictionary.cs | ||
ItemKeyValuePair.cs | ||
Module.cs | ||
ResponseContractResolver.cs | ||
Validate.cs | ||
XmlOutputFormatter.cs |