Merge branch 'master' of https://github.com/splitbrain/dokuwiki
Conflicts: lib/exe/xmlrpc.php
No related branches found
No related tags found
Showing
- COPYING 20 additions, 21 deletionsCOPYING
- README 1 addition, 1 deletionREADME
- _test/cases/inc/auth_password.test.php 6 additions, 0 deletions_test/cases/inc/auth_password.test.php
- _test/cases/inc/common_cleanText.test.php 34 additions, 0 deletions_test/cases/inc/common_cleanText.test.php
- _test/cases/inc/parser/parser_links.test.php 15 additions, 0 deletions_test/cases/inc/parser/parser_links.test.php
- conf/dokuwiki.php 9 additions, 2 deletionsconf/dokuwiki.php
- data/_dummy 0 additions, 1 deletiondata/_dummy
- data/pages/wiki/syntax.txt 1 addition, 1 deletiondata/pages/wiki/syntax.txt
- doku.php 1 addition, 1 deletiondoku.php
- feed.php 3 additions, 3 deletionsfeed.php
- inc/HTTPClient.php 11 additions, 7 deletionsinc/HTTPClient.php
- inc/PassHash.class.php 51 additions, 0 deletionsinc/PassHash.class.php
- inc/RemoteAPICore.php 32 additions, 26 deletionsinc/RemoteAPICore.php
- inc/Sitemapper.php 6 additions, 6 deletionsinc/Sitemapper.php
- inc/adLDAP.php 20 additions, 0 deletionsinc/adLDAP.php
- inc/auth.php 51 additions, 21 deletionsinc/auth.php
- inc/auth/ad.class.php 43 additions, 5 deletionsinc/auth/ad.class.php
- inc/changelog.php 7 additions, 5 deletionsinc/changelog.php
- inc/html.php 38 additions, 14 deletionsinc/html.php
- inc/init.php 22 additions, 14 deletionsinc/init.php
Loading
Please register or sign in to comment