diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-03-14 14:33:43 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-03-14 14:33:43 +0100 |
| commit | c6fcd0ad055d82fceae05cda6e1281b7125d69d0 (patch) | |
| tree | 2b1a8fb576619b49e1fd9ad5e02e234de3cb127f /lib/exe/js.php | |
| parent | 087e0e44c40547b3b15f129017a82ba56f29c145 (diff) | |
| parent | b0fedeccedf889d4d6ddaa76ec2a9b4da3e84347 (diff) | |
| download | rpg-c6fcd0ad055d82fceae05cda6e1281b7125d69d0.tar.gz rpg-c6fcd0ad055d82fceae05cda6e1281b7125d69d0.tar.bz2 | |
Merge branch 'lang_update_123' of git://github.com/dokuwiki-translate/dokuwiki into pull-request-611
* 'lang_update_123' 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