Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0

2014-03-06 18:26:10 +11:00
parent 72c5853fb1 f03b1a22f9
commit fa7f91b39d
21 changed files with 680 additions and 37 deletions
--- a/src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
@@ -1,4 +1,5 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Edit data type"
+    ValidateRequest="false"
    CodeBehind="editDatatype.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.developer.editDatatype" %>

 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>