Stephan 36d6e4b4da Merge branch '7.0.0' into 7.0.0-pubcontent ...

Conflicts:
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs

2013-09-26 08:57:01 +02:00

..

PublishedContentCache.cs

Merge branch '7.0.0' into 7.0.0-pubcontent

2013-09-26 08:57:01 +02:00

PublishedMediaCache.cs

Merge branch '7.0.0' into 7.0.0-pubcontent

2013-09-26 08:57:01 +02:00

RoutesCache.cs

Take care of more FIXMEs

2013-09-18 10:09:05 +02:00

UmbracoContextCache.cs

PublishedContent - the big refactoring

2013-09-16 17:17:45 +02:00

XmlPublishedContent.cs

Fix build after merge

2013-09-24 09:12:58 +02:00

XmlPublishedProperty.cs

PublishedContent - revert to using property.Value vs .ObjectValue

2013-09-25 12:54:24 +02:00