diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-04-15 15:21:04 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-04-15 15:21:04 +0200 |
| commit | 8aea63819532f5f49c22a3a225e18eb2640f1d71 (patch) | |
| tree | fa946185781e0dbe269d831632b8c19973e272d8 /inc/pageutils.php | |
| parent | ae7c596cf4e6a0a09ebcf01fe8ae98789360c5be (diff) | |
| parent | b5cc8f4b6bd4593e984fa6009532fae8eda57a7f (diff) | |
| download | rpg-8aea63819532f5f49c22a3a225e18eb2640f1d71.tar.gz rpg-8aea63819532f5f49c22a3a225e18eb2640f1d71.tar.bz2 | |
Merge branch 'master' into htmlmail
* master:
extended some config options a bit, to make more clear what they do
rearranged the config options
Conflicts:
conf/dokuwiki.php
lib/plugins/config/lang/en/lang.php
lib/plugins/config/settings/config.metadata.php
Diffstat (limited to 'inc/pageutils.php')
0 files changed, 0 insertions, 0 deletions