Merge branch 'dev-v7.6' into temp-gulp-spike

# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
This commit is contained in:
Mads Rasmussen
2017-05-05 13:01:24 +02:00
1305 changed files with 52796 additions and 21477 deletions

1
.gitignore vendored
View File

@@ -143,3 +143,4 @@ build/ui-docs.zip
build/csharp-docs.zip
build/msbuild.log
.vs/
src/packages/