Merge remote-tracking branch 'origin/master' into FS#2124deniedtext
Conflicts: inc/lang/bn/lang.php inc/lang/fr/denied.txt
Showing
- .gitignore 6 additions, 4 deletions.gitignore
- _test/tests/inc/parserutils_get_renderer.test.php 83 additions, 0 deletions_test/tests/inc/parserutils_get_renderer.test.php
- data/pages/wiki/dokuwiki.txt 3 additions, 3 deletionsdata/pages/wiki/dokuwiki.txt
- feed.php 8 additions, 9 deletionsfeed.php
- inc/EmailAddressValidator.php 10 additions, 10 deletionsinc/EmailAddressValidator.php
- inc/actions.php 1 addition, 1 deletioninc/actions.php
- inc/cache.php 75 additions, 25 deletionsinc/cache.php
- inc/common.php 7 additions, 3 deletionsinc/common.php
- inc/events.php 32 additions, 12 deletionsinc/events.php
- inc/fetch.functions.php 1 addition, 1 deletioninc/fetch.functions.php
- inc/form.php 6 additions, 10 deletionsinc/form.php
- inc/fulltext.php 14 additions, 2 deletionsinc/fulltext.php
- inc/httputils.php 7 additions, 6 deletionsinc/httputils.php
- inc/lang/bn/lang.php 32 additions, 1 deletioninc/lang/bn/lang.php
- inc/lang/fr/denied.txt 1 addition, 1 deletioninc/lang/fr/denied.txt
- inc/lang/fr/lang.php 7 additions, 5 deletionsinc/lang/fr/lang.php
- inc/lang/nl/lang.php 1 addition, 0 deletionsinc/lang/nl/lang.php
- inc/load.php 6 additions, 0 deletionsinc/load.php
- inc/pageutils.php 8 additions, 0 deletionsinc/pageutils.php
- inc/parser/code.php 0 additions, 1 deletioninc/parser/code.php
Loading
Please register or sign in to comment