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/feedcreator.class.php | |
| 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/feedcreator.class.php')
0 files changed, 0 insertions, 0 deletions