Home
last modified time | relevance | path

Searched hist:cdf972d7cde39b42046f4b7912539ea87c5675e6 (Results 1 – 2 of 2) sorted by relevance

/dokuwiki/lib/plugins/authad/lang/de/
H A Dsettings.phpcdf972d7cde39b42046f4b7912539ea87c5675e6 Sat Nov 16 22:28:38 UTC 2013 Anika Henke <anika@selfthinker.org> Merge branch 'lang_update_464' of github.com:dokuwiki-translate/dokuwiki into lang_update_464

Conflicts:
lib/plugins/authad/lang/de/settings.php
lib/plugins/usermanager/lang/de/lang.php

/dokuwiki/lib/plugins/usermanager/lang/de/
H A Dlang.phpcdf972d7cde39b42046f4b7912539ea87c5675e6 Sat Nov 16 22:28:38 UTC 2013 Anika Henke <anika@selfthinker.org> Merge branch 'lang_update_464' of github.com:dokuwiki-translate/dokuwiki into lang_update_464

Conflicts:
lib/plugins/authad/lang/de/settings.php
lib/plugins/usermanager/lang/de/lang.php