Skip to content
Snippets Groups Projects
Commit 360b3a15 authored by Andreas Gohr's avatar Andreas Gohr
Browse files

Merge branch 'lang_update_518' of git://github.com/dokuwiki-translate/dokuwiki... 

Merge branch 'lang_update_518' of git://github.com/dokuwiki-translate/dokuwiki into pull-request-450

* 'lang_update_518' of git://github.com/dokuwiki-translate/dokuwiki:
  translation update

Conflicts:
	lib/plugins/usermanager/lang/ko/lang.php
parents 42906a50 ffe35fe9
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 111 additions and 107 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