pavelbannov de16476542 Merge branch 'master' into refactoring/di ... # 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		2019-09-16 15:35:44 +03:00
..
ApiContext.cs	Merge branch 'master' into refactoring/di	2019-09-16 15:35:44 +03:00
ApiDateTime.cs	ApiDateTime: fix ReadJson	2019-08-22 16:41:13 +03:00
CustomEndpointDataSource.cs	Api: format endpoint via datasource	2019-06-25 13:46:10 +03:00
CustomJsonOptionsWrapper.cs	Api: added CustomJsonOptionsWrapper. optimization	2019-09-03 12:31:15 +03:00
ItemDictionary.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ItemKeyValuePair.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
Module.cs	Api: added module id	2019-07-29 13:04:43 +03:00
ResponseContractResolver.cs	Api: added CustomJsonOptionsWrapper. optimization	2019-09-03 12:31:15 +03:00
Validate.cs	Code Cleanup	2019-08-15 15:04:42 +03:00
XmlOutputFormatter.cs	Api: fields	2019-08-02 17:40:33 +03:00