diff options
author | Andreas Gohr <andi@splitbrain.org> | 2014-02-28 12:05:54 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2014-02-28 12:05:54 +0100 |
commit | c845a32557460aaeb6efa874e493a54455a0af60 (patch) | |
tree | 0bec744fe510199fad0efd06257f63944654abf0 /lib/scripts/edit.js | |
parent | 176279377b99c01aa3ca08bd1a25b134fe7f97b0 (diff) | |
parent | 4292840ce374036541a92449670ed9ae83a3c64d (diff) | |
download | rpg-c845a32557460aaeb6efa874e493a54455a0af60.tar.gz rpg-c845a32557460aaeb6efa874e493a54455a0af60.tar.bz2 |
Merge branch 'lang_update_70' of git://github.com/dokuwiki-translate/dokuwiki into pull-request-570
* 'lang_update_70' of git://github.com/dokuwiki-translate/dokuwiki:
translation update
Conflicts:
lib/plugins/extension/lang/nl/lang.php
Diffstat (limited to 'lib/scripts/edit.js')
0 files changed, 0 insertions, 0 deletions