diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-02-28 12:06:55 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-02-28 12:06:55 +0100 |
| commit | ab802fc89a5dced1d1fa8d0c6a1ff68b2becc144 (patch) | |
| tree | 711da351854f6b9e2f2bba3c2669e75cae29bc76 /lib/scripts/script.js | |
| parent | c845a32557460aaeb6efa874e493a54455a0af60 (diff) | |
| parent | 370fac6347ec430cd72e724f45431a294b4f6662 (diff) | |
| download | rpg-ab802fc89a5dced1d1fa8d0c6a1ff68b2becc144.tar.gz rpg-ab802fc89a5dced1d1fa8d0c6a1ff68b2becc144.tar.bz2 | |
Merge branch 'lang_update_69' of git://github.com/dokuwiki-translate/dokuwiki into pull-request-569
* 'lang_update_69' of git://github.com/dokuwiki-translate/dokuwiki:
translation update
Conflicts:
lib/plugins/extension/lang/nl/lang.php
Diffstat (limited to 'lib/scripts/script.js')
0 files changed, 0 insertions, 0 deletions