"8aea63819532f5f49c22a3a225e18eb2640f1d71" (history) in projects: dokuwiki

Searched hist:"8 aea63819532f5f49c22a3a225e18eb2640f1d71" (Results 1 – 3 of 3) sorted by relevance

/dokuwiki/lib/plugins/config/lang/en/
H A D	lang.php	`8aea63819532f5f49c22a3a225e18eb2640f1d71 Sun Apr 15 13:21:04 UTC 2012 Andreas Gohr <andi@splitbrain.org> 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`
/dokuwiki/lib/plugins/config/settings/
H A D	config.metadata.php	`8aea63819532f5f49c22a3a225e18eb2640f1d71 Sun Apr 15 13:21:04 UTC 2012 Andreas Gohr <andi@splitbrain.org> 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`
/dokuwiki/conf/
H A D	dokuwiki.php	`8aea63819532f5f49c22a3a225e18eb2640f1d71 Sun Apr 15 13:21:04 UTC 2012 Andreas Gohr <andi@splitbrain.org> 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`