diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2012-09-19 00:10:19 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2012-09-19 00:10:19 +0200 |
| commit | 027c801a4dc51db673bcbfcfbd396845f244e357 (patch) | |
| tree | 4be2941bd3d92d7cd1f07b61fd3c072b0007abe3 /data/config.default.php | |
| parent | 72dac890a041b8261262c7df7d7f8a8a816a146b (diff) | |
| parent | d316adab970b993504ba38736a0f8753ef4bb052 (diff) | |
| download | phorkie-027c801a4dc51db673bcbfcfbd396845f244e357.tar.gz phorkie-027c801a4dc51db673bcbfcfbd396845f244e357.zip | |
Merge remote-tracking branch 'jnovack/markdown'
Conflicts:
ChangeLog
Diffstat (limited to 'data/config.default.php')
| -rw-r--r-- | data/config.default.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/data/config.default.php b/data/config.default.php index a087767..abcb43e 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -66,6 +66,11 @@ $GLOBALS['phorkie']['languages'] = array( 'mime' => 'application/javascript', 'geshi' => 'javascript' ), + 'md' => array( + 'title' => 'Markdown', + 'mime' => 'text/x-markdown', + 'renderer' => '\\phorkie\\Renderer_Markdown' + ), 'pl' => array( 'title' => 'Perl', 'mime' => 'application/x-perl', |