Shannon 65ece33ca9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 ...

# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
#	src/Umbraco.Web.UI.Client/src/installer/_module.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js

2017-09-07 22:43:03 +10:00

4.1 KiB

Raw Blame History

View Raw