aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--data/config.default.php6
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 03855dc..fc17753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-01 Christian Weiske <cweiske@cweiske.de>
+
+ * Fix bug #27: render .json files
+
2012-09-28 Christian Weiske <cweiske@cweiske.de>
* Check for OpenID package in SetupCheck
diff --git a/data/config.default.php b/data/config.default.php
index abcb43e..1374b1b 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -66,6 +66,12 @@ $GLOBALS['phorkie']['languages'] = array(
'mime' => 'application/javascript',
'geshi' => 'javascript'
),
+ 'json' => array(
+ 'title' => 'Javascript',
+ 'mime' => 'application/javascript',
+ 'geshi' => 'javascript',
+ 'show' => false
+ ),
'md' => array(
'title' => 'Markdown',
'mime' => 'text/x-markdown',