diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-09 17:26:28 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-09 17:26:28 +0100 |
| commit | 8702de7f7e170bddfdb622c393c3cac3446fd1c5 (patch) | |
| tree | c7269ea61f5d4230a6f916dbabee4ce412e0a9fb /bin | |
| parent | 1cc82e5c76ae7fcd646e448404afdc0fd458bf55 (diff) | |
| parent | 9a0ca2cfd8ac42895af3be2efbd2cab7e6d33578 (diff) | |
| download | rpg-8702de7f7e170bddfdb622c393c3cac3446fd1c5.tar.gz rpg-8702de7f7e170bddfdb622c393c3cac3446fd1c5.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into scrutinizerissues
Conflicts:
inc/media.php
inc/plugin.php
inc/template.php
lib/plugins/authplain/_test/escaping.test.php
lib/plugins/syntax.php
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/striplangs.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/striplangs.php b/bin/striplangs.php index 6335bc84c..82d27d462 100755 --- a/bin/striplangs.php +++ b/bin/striplangs.php @@ -26,7 +26,8 @@ class StripLangsCLI extends DokuCLI { $options->registerOption( 'keep', 'Comma separated list of languages to keep in addition to English.', - 'k' + 'k', + 'langcodes' ); $options->registerOption( 'english-only', |