diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-05-19 20:45:57 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-05-19 20:45:57 +0200 |
| commit | b66e5840006078112b8da741b2c612e446afd452 (patch) | |
| tree | a7067fa152428b3c0b41cae8435a94997167bacb /inc/lang/ja/lang.php | |
| parent | c8d7c9382a31eaccc516f088312894797f4fe4bb (diff) | |
| parent | 54b26fbe1e0f9efaba143d88ea8581933f5c8dc8 (diff) | |
| download | rpg-b66e5840006078112b8da741b2c612e446afd452.tar.gz rpg-b66e5840006078112b8da741b2c612e446afd452.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into trailingcolons
Conflicts:
lib/plugins/usermanager/lang/nl/intro.txt
Diffstat (limited to 'inc/lang/ja/lang.php')
| -rw-r--r-- | inc/lang/ja/lang.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php index 31832c71f..e3eb4c7c7 100644 --- a/inc/lang/ja/lang.php +++ b/inc/lang/ja/lang.php @@ -11,6 +11,7 @@ * @author Satoshi Sahara <sahara.satoshi@gmail.com> * @author Hideaki SAWADA <chuno@live.jp> * @author Hideaki SAWADA <sawadakun@live.jp> + * @author PzF_X <jp_minecraft@yahoo.co.jp> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; |