Commit Graph

1 Commits

Author SHA1 Message Date
Shannon
c6a586274e Merge branch 'U4-8189' of https://github.com/danlister/Umbraco-CMS into danlister-U4-8189
Conflicts:
	src/Umbraco.Core/Constants-Applications.cs
	src/Umbraco.Web/Umbraco.Web.csproj
2016-03-31 19:40:07 +02:00