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

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

Browse Source
This commit is contained in:
Shannon
2014-03-11 10:39:55 +11:00
parent d95ca7bc6f 6b491ac6cd
commit 2db1c1bb40
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<language alias="en" intName="English (UK)" localName="English (UK)" lcid="" culture="en-GB">
<language alias="en_us" intName="English (US)" localName="English (US)" lcid="" culture="en-US">
<creator>
<name>umbraco</name>
<link>http://umbraco.org</link>