Merge remote-tracking branch 'origin/master' into trailingcolons
Conflicts: lib/plugins/usermanager/lang/nl/intro.txt
No related branches found
No related tags found
Showing
- _test/tests/inc/cli_options.test.php 56 additions, 0 deletions_test/tests/inc/cli_options.test.php
- bin/dwpage.php 268 additions, 329 deletionsbin/dwpage.php
- bin/gittool.php 105 additions, 111 deletionsbin/gittool.php
- bin/indexer.php 90 additions, 85 deletionsbin/indexer.php
- bin/render.php 44 additions, 50 deletionsbin/render.php
- bin/striplangs.php 88 additions, 126 deletionsbin/striplangs.php
- bin/wantedpages.php 111 additions, 112 deletionsbin/wantedpages.php
- inc/TarLib.class.php 2 additions, 0 deletionsinc/TarLib.class.php
- inc/changelog.php 4 additions, 2 deletionsinc/changelog.php
- inc/cli.php 647 additions, 0 deletionsinc/cli.php
- inc/cliopts.php 1 addition, 0 deletionsinc/cliopts.php
- inc/common.php 1 addition, 1 deletioninc/common.php
- inc/infoutils.php 26 additions, 0 deletionsinc/infoutils.php
- inc/lang/ja/lang.php 1 addition, 0 deletionsinc/lang/ja/lang.php
- inc/load.php 4 additions, 0 deletionsinc/load.php
- inc/plugin.php 1 addition, 0 deletionsinc/plugin.php
- inc/subscription.php 1 addition, 0 deletionsinc/subscription.php
- lib/plugins/authad/lang/ja/lang.php 8 additions, 0 deletionslib/plugins/authad/lang/ja/lang.php
- lib/plugins/authad/lang/ja/settings.php 2 additions, 0 deletionslib/plugins/authad/lang/ja/settings.php
- lib/plugins/authldap/auth.php 58 additions, 2 deletionslib/plugins/authldap/auth.php
Loading
Please register or sign in to comment