Shannon
d281f97659
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web.UI/umbraco/config/create/UI.xml
src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
src/Umbraco.Web.UI/umbraco/create/xslt.ascx
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/UmbracoHelper.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
2013-10-09 11:12:33 +11:00
..
2012-07-18 04:35:30 +06:00
2013-06-28 12:23:15 +10:00
2012-07-18 04:35:30 +06:00
2013-06-09 06:16:56 -02:00
2013-06-09 06:16:56 -02:00
2013-10-05 19:23:57 +02:00
2012-07-18 04:35:30 +06:00
2013-05-27 06:05:13 -02:00
2012-07-18 04:35:30 +06:00
2013-04-09 06:07:25 +06:00
2012-07-18 04:35:30 +06:00
2012-07-18 04:35:30 +06:00