Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0'

This commit is contained in:
Eric Erhardt 2016-07-19 07:09:57 -05:00
commit 4de7863e74

2
.gitignore vendored
View file

@ -41,7 +41,7 @@ cmake/
build_tools
# `dotnet new` template zip files are generated by a pre-build step.
/src/dotnet/commands/dotnet-new/*.zip
/src/dotnet/commands/dotnet-new/*.zip
### VisualStudio.gitignore from https://raw.githubusercontent.com/github/gitignore/master/VisualStudio.gitignore ###