diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2016-10-14 21:48:52 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2016-10-14 21:48:52 +0200 |
| commit | 97bb9096bb9fdbb516c69d584d4e21289cda34c0 (patch) | |
| tree | 447829cd4d7270080e4b95e3060471caa2ff1d02 /lib/scripts/jquery | |
| parent | 72a2437127496e903697f114e6c12c26776bcab4 (diff) | |
| parent | dc79945fce166184ed8f1fa2b0bb0fa77e9f6356 (diff) | |
| download | dokuwiki-97bb9096bb9fdbb516c69d584d4e21289cda34c0.tar.gz dokuwiki-97bb9096bb9fdbb516c69d584d4e21289cda34c0.zip | |
Merge branch 'dokuwiki-translate-lang_update_150'
Conflicts:
lib/plugins/authad/lang/no/lang.php
lib/plugins/authad/lang/no/settings.php
Diffstat (limited to 'lib/scripts/jquery')
0 files changed, 0 insertions, 0 deletions