Merge branch 'refs/heads/3.1.0' into 3.1

2013-10-06 19:06:53 +02:00 · 2013-10-06 19:06:53 +02:00 · 6f8ff5cafe
parent 902c8db859 487de0bf5a
commit 6f8ff5cafe
1 changed files with 1 additions and 1 deletions
--- a/lang/ja_JP.yml
+++ b/lang/ja_JP.yml
@ -1,4 +1,4 @@
-ja_JP:
+ja:
  AssetAdmin:
    NEWFOLDER: 新しいフォルダ
  AssetTableField: