Merge branch 'rel/1.1.0-preview1' into dev

Merges branches without bringing back in the change to add dotnet-publish-iis to the 1.1.0-preview1 release.
This commit is contained in:
Nate McMaster 2016-10-18 17:01:40 -07:00
commit 38e22cd648
1 changed files with 3 additions and 1 deletions

4
.gitignore vendored
View File

@ -27,4 +27,6 @@ project.lock.json
*.ipch
*.vs/
.testPublish/
.build/
.build/
*.nuget.props
*.nuget.targets