Skip to content
Snippets Groups Projects
Commit 0fe6fed0 authored by Anika Henke's avatar Anika Henke
Browse files

Merge branch 'lang_update_18' of... 

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
parents d96e9e80 45cb016d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 178 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment