Merge remote-tracking branch 'origin/master' into overridablelangstrings
Conflicts: inc/plugin.php
No related branches found
No related tags found
Showing
- .gitattributes 8 additions, 0 deletions.gitattributes
- .travis.yml 5 additions, 0 deletions.travis.yml
- _test/tests/inc/cache_use.test.php 8 additions, 2 deletions_test/tests/inc/cache_use.test.php
- _test/tests/inc/cli_options.test.php 56 additions, 0 deletions_test/tests/inc/cli_options.test.php
- _test/tests/inc/init_checkssl.test.php 81 additions, 0 deletions_test/tests/inc/init_checkssl.test.php
- _test/tests/inc/input.test.php 50 additions, 0 deletions_test/tests/inc/input.test.php
- _test/tests/lib/exe/css_css_compress.test.php 15 additions, 0 deletions_test/tests/lib/exe/css_css_compress.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
- doku.php 1 addition, 1 deletiondoku.php
- feed.php 6 additions, 2 deletionsfeed.php
- inc/HTTPClient.php 19 additions, 7 deletionsinc/HTTPClient.php
- inc/Input.class.php 47 additions, 11 deletionsinc/Input.class.php
- inc/TarLib.class.php 2 additions, 0 deletionsinc/TarLib.class.php
- inc/auth.php 9 additions, 7 deletionsinc/auth.php
- inc/cache.php 1 addition, 0 deletionsinc/cache.php
Loading
Please register or sign in to comment