Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-gulp-spike

# Conflicts:
#	build/BuildBelle.bat
This commit is contained in:
Per Ploug
2017-08-07 14:05:53 +02:00
261 changed files with 5808 additions and 1837 deletions

4
.gitignore vendored
View File

@@ -143,4 +143,6 @@ build/ui-docs.zip
build/csharp-docs.zip
build/msbuild.log
.vs/
src/packages/
src/packages/
build/tools/
src/PrecompiledWeb/*