| #
0fe6fed0 |
| 23-May-2016 |
Anika Henke <anika@selfthinker.org> |
Merge branch 'lang_update_18' of https://github.com/dokuwiki-translate/dokuwiki into dokuwiki-translate-lang_update_18
Conflicts: lib/plugins/authplain/lang/hr/lang.php lib/plugins/config/lang/hr/
Merge branch 'lang_update_18' of https://github.com/dokuwiki-translate/dokuwiki into dokuwiki-translate-lang_update_18
Conflicts: lib/plugins/authplain/lang/hr/lang.php lib/plugins/config/lang/hr/lang.php
show more ...
|