diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2014-07-04 07:37:06 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2014-07-04 07:37:06 +0200 |
| commit | 43ef6e8dfd4345262f7b974506261e0827bfecae (patch) | |
| tree | 8caa1bbb422c4aef711d02d2dfc0d5a14d187d64 /data | |
| parent | 227289a8fa6093f468290d4b3b68f6948f1a2b14 (diff) | |
| parent | 239fca45d3685c2f3290015b49470f945648a8e5 (diff) | |
| download | phorkie-43ef6e8dfd4345262f7b974506261e0827bfecae.tar.gz phorkie-43ef6e8dfd4345262f7b974506261e0827bfecae.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
src/phorkie/Renderer/Geshi.php
src/phorkie/SetupCheck.php
Diffstat (limited to 'data')
| -rw-r--r-- | data/config.default.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/data/config.default.php b/data/config.default.php index 22bbc4a..2e588fa 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -20,7 +20,6 @@ $GLOBALS['phorkie']['cfg'] = array( 'topbar' => '', 'setupcheck' => true, 'elasticsearch' => null, - 'geshi' => 'MediaWiki/geshi/geshi/geshi.php', 'index' => 'new',//"new" or "list" 'perPage' => 10, 'defaultListPage' => 'last',//a number or "last" |