diff options
author | Anika Henke <anika@selfthinker.org> | 2013-11-16 22:28:38 +0000 |
---|---|---|
committer | Anika Henke <anika@selfthinker.org> | 2013-11-16 22:28:38 +0000 |
commit | cdf972d7cde39b42046f4b7912539ea87c5675e6 (patch) | |
tree | 7ba223671bec84d18180c9306610f008c8a709fd /lib/plugins/authmysql | |
parent | 030141fb5c151649e32dcc286a65102531c96558 (diff) | |
parent | 0fdcfd96106295c8aac3f83b36be0ac4e3b21d46 (diff) | |
download | rpg-cdf972d7cde39b42046f4b7912539ea87c5675e6.tar.gz rpg-cdf972d7cde39b42046f4b7912539ea87c5675e6.tar.bz2 |
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
Diffstat (limited to 'lib/plugins/authmysql')
0 files changed, 0 insertions, 0 deletions