Stephan 05f7ede26a Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent ...

Conflicts:
	src/Umbraco.Web/umbraco.presentation/macro.cs

2013-09-30 14:12:36 +02:00

..

TemplateRenderer.cs

Fixes: #U4-2460 - UmbracoHelper.RenderTemplate will now execute the complete MVC cycle when rendering MVC templates whereas before it would only execute the view which means any actionfilters, etc... applied would never have fired (as well as other things)

2013-07-05 14:12:31 +10:00

TemplateUtilities.cs

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-30 14:12:36 +02:00