diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-03-14 16:20:28 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-03-14 16:20:28 +0100 |
| commit | a280c123d85db2bd11a95b562080baf6d225a28d (patch) | |
| tree | 2d1be77abbfe174bf92b44cba4673c3abcbbcd3b /lib/exe/js.php | |
| parent | 672a91c16be60e43a2b49c135d7e557ee31d4198 (diff) | |
| parent | abaffa745a174b306d15c70aa8610f7ef5bd3a80 (diff) | |
| download | rpg-a280c123d85db2bd11a95b562080baf6d225a28d.tar.gz rpg-a280c123d85db2bd11a95b562080baf6d225a28d.tar.bz2 | |
Merge branch 'lang_update_119' of git://github.com/dokuwiki-translate/dokuwiki into pull-request-605
* 'lang_update_119' of git://github.com/dokuwiki-translate/dokuwiki:
translation update
Conflicts:
lib/plugins/acl/lang/et/lang.php
Diffstat (limited to 'lib/exe/js.php')
0 files changed, 0 insertions, 0 deletions