Sebastiaan Janssen dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0 ...

Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config

2014-08-04 13:32:44 +02:00

3.4 KiB

Raw Blame History

View Raw