Merge remote-tracking branch 'origin/fix-net-http-tests' into fix-net… · dotnet/corefx@b6a0a02 · GitHub

This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Merge remote-tracking branch 'origin/fix-net-http-tests' into fix-net…

Browse files

…-http-tests

Conflicts:
	dir.props
	src/.nuget/packages.Windows_NT.config
	src/System.Net.Http/tests/project.lock.json

Loading branch information

mmitche committed Jun 23, 2015

2 parents b228565 + dc36390 commit b6a0a02