yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/src/installer/installer.service.js
This commit is contained in:
per ploug
2014-11-18 17:45:23 +01:00
parent 90d78d1b60 5673b1907b
commit d3f3e161e0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/umbraco/developer/Macros/editMacro.aspx
View File

@@ -99,11 +99,11 @@
<cc1:Pane ID="Pane1_3" runat="server" Title="Editor settings">
<cc1:PropertyPanel runat="server" Text="Use in rich text editor">
<cc1:PropertyPanel runat="server" Text="Use in rich text editor and the grid">
<asp:CheckBox ID="macroEditor" runat="server" Text="Yes"></asp:CheckBox>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text="Render in rich text editor">
<cc1:PropertyPanel runat="server" Text="Render in rich text editor and the grid">
<asp:CheckBox ID="macroRenderContent" runat="server" Text="Yes"></asp:CheckBox>
</cc1:PropertyPanel>
</cc1:Pane>