Commit Graph

1 Commits

Author SHA1 Message Date
Shannon
1bfb32dcdc Merge branch 'U4-8588' of https://github.com/JimBobSquarePants/Umbraco-CMS into JimBobSquarePants-U4-8588
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Web.UI/packages.config
2016-06-23 16:55:04 +02:00