Merge remote-tracking branch 'origin/master' into revsizechange
Conflicts: inc/common.php
No related branches found
No related tags found
Showing
- .htaccess.dist 12 additions, 2 deletions.htaccess.dist
- .travis.yml 5 additions, 2 deletions.travis.yml
- _test/tests/inc/common_blank.test.php 52 additions, 0 deletions_test/tests/inc/common_blank.test.php
- _test/tests/inc/common_saveWikiText.test.php 145 additions, 0 deletions_test/tests/inc/common_saveWikiText.test.php
- _test/tests/inc/form/buttonelement.test.php 40 additions, 0 deletions_test/tests/inc/form/buttonelement.test.php
- _test/tests/inc/form/checkableelement.test.php 2 additions, 0 deletions_test/tests/inc/form/checkableelement.test.php
- _test/tests/inc/form/inputelement.test.php 17 additions, 0 deletions_test/tests/inc/form/inputelement.test.php
- _test/tests/inc/io_readfile.test.php 2 additions, 2 deletions_test/tests/inc/io_readfile.test.php
- _test/tests/inc/io_replaceinfile.test.php 2 additions, 2 deletions_test/tests/inc/io_replaceinfile.test.php
- _test/tests/inc/io_savefile.test.php 2 additions, 2 deletions_test/tests/inc/io_savefile.test.php
- _test/tests/inc/parser/parser_media.test.php 50 additions, 19 deletions_test/tests/inc/parser/parser_media.test.php
- _test/tests/inc/remote.test.php 18 additions, 0 deletions_test/tests/inc/remote.test.php
- bin/.htaccess 7 additions, 2 deletionsbin/.htaccess
- bin/dwpage.php 1 addition, 1 deletionbin/dwpage.php
- conf/.htaccess 7 additions, 2 deletionsconf/.htaccess
- conf/dokuwiki.php 1 addition, 1 deletionconf/dokuwiki.php
- conf/interwiki.conf 1 addition, 1 deletionconf/interwiki.conf
- conf/license.php 8 additions, 8 deletionsconf/license.php
- data/.htaccess 7 additions, 2 deletionsdata/.htaccess
- data/deleted.files 0 additions, 58 deletionsdata/deleted.files
Loading
Please register or sign in to comment