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

Merge remote-tracking branch 'origin/6.2.0' into 7.0.0

Browse Source 
Conflicts:
	src/Umbraco.Web.UI/umbraco/members/EditMember.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
This commit is contained in:
Shannon
2013-11-07 12:30:28 +11:00
parent ceab957db5 fc0654a80f
commit fad84ac0bb
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -308,7 +308,7 @@
<key alias="alias">Alias</key>
<key alias="areyousure">Are you sure?</key>
<key alias="border">Border</key>
<key alias="by">or</key>
<key alias="by">by</key>
<key alias="cancel">Cancel</key>
<key alias="cellMargin">Cell margin</key>
<key alias="choose">Choose</key>