diff options
| author | Anika Henke <anika@selfthinker.org> | 2015-08-16 16:44:31 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2015-08-16 16:44:31 +0100 |
| commit | 0472957b2caacb53a084440f308564a749659f3c (patch) | |
| tree | 4ece813f25a270c15c4cf55140c7ce7e7c762d06 /inc/lang/ru | |
| parent | dc562627d58f4ff227f44ceb3aebc116f8b8bb37 (diff) | |
| parent | d1e3b6f51641353eed38d7b375bc54f837ea8c76 (diff) | |
| download | rpg-0472957b2caacb53a084440f308564a749659f3c.tar.gz rpg-0472957b2caacb53a084440f308564a749659f3c.tar.bz2 | |
Merge branch 'lang_update_826' of https://github.com/dokuwiki-translate/dokuwiki into dokuwiki-translate-lang_update_826
Conflicts:
lib/plugins/styling/lang/ru/intro.txt
lib/plugins/styling/lang/ru/lang.php
Diffstat (limited to 'inc/lang/ru')
| -rw-r--r-- | inc/lang/ru/lang.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php index 40d3ffefe..569ea0d9b 100644 --- a/inc/lang/ru/lang.php +++ b/inc/lang/ru/lang.php @@ -2,7 +2,7 @@ /** * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) - * + * * @author Yuri Pimenov <up@ftpsearch.lv> * @author Igor Tarasov <tigr@mail15.com> * @author Denis Simakov <akinoame1@gmail.com> @@ -32,6 +32,7 @@ * @author Alex P <alexander@lanos.co.uk> * @author Nolf <m.kopachovets@gmail.com> * @author Takumo <9206984@mail.ru> + * @author RainbowSpike <1@2.ru> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; |