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 /src/phorkie/Renderer/Geshi.php | |
| 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 'src/phorkie/Renderer/Geshi.php')
| -rw-r--r-- | src/phorkie/Renderer/Geshi.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/phorkie/Renderer/Geshi.php b/src/phorkie/Renderer/Geshi.php index c422716..0c545ed 100644 --- a/src/phorkie/Renderer/Geshi.php +++ b/src/phorkie/Renderer/Geshi.php @@ -15,7 +15,7 @@ class Renderer_Geshi { /** * Yes, geshi needs to be in your include path - * We use the mediawiki geshi extension package. + * We use the geshi pear package. */ if (!class_exists('\\geshi', true)) { require_once $GLOBALS['phorkie']['cfg']['geshi']; |