diff options
author | Andreas Gohr <andi@splitbrain.org> | 2012-06-29 14:55:35 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2012-06-29 14:55:35 +0200 |
commit | bca545e60204a29018cc5002a1280a01b64594d9 (patch) | |
tree | a75a9d1529581c265cb2f428df01e9fa24504b98 /inc/geshi/php.php | |
parent | 5d0aaf958325f500ce69cfb79e69eb0d8f83fdeb (diff) | |
parent | 8f50749b133eb2da6dc2d69adc4fb163ed9d41c2 (diff) | |
download | rpg-bca545e60204a29018cc5002a1280a01b64594d9.tar.gz rpg-bca545e60204a29018cc5002a1280a01b64594d9.tar.bz2 |
Merge branch 'master' of git://github.com/Aorimn/dokuwiki into pull-request-76
* 'master' of git://github.com/Aorimn/dokuwiki:
Change default groupwildcards option to 0 not to change behavior of
Added support for the %GROUP% wildcard.
Conflicts:
inc/auth.php
Diffstat (limited to 'inc/geshi/php.php')
0 files changed, 0 insertions, 0 deletions