summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--distrib/gitblit.properties2
-rw-r--r--docs/04_releases.mkd1
2 files changed, 2 insertions, 1 deletions
diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 411699ff..60b1a897 100644
--- a/distrib/gitblit.properties
+++ b/distrib/gitblit.properties
@@ -679,7 +679,7 @@ web.luceneIgnoreExtensions = 7z arc arj bin bmp dll doc docx exe gif gz jar jpg
#
# SPACE-DELIMITED
# SINCE 0.5.0
-web.prettyPrintExtensions = c cpp cs css htm html java js php pl prefs properties py rb sh sql xml vb
+web.prettyPrintExtensions = c cpp cs css frm htm html java js php pl prefs properties py rb sh sql xml vb
# Registered extensions for markdown transformation
#
diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 5e5eb6a2..9d721f92 100644
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -56,6 +56,7 @@ In order to fork a repository, the user account must have the *fork* permission
- Teams can now specify the *admin*, *create*, and *fork* roles to simplify user administration
- Use https Gravatar urls to avoid browser complaints
+- Added frm to default pretty print extensions (issue 156)
- Expose ReceivePack to Groovy push hooks (issue 125)
- Redirect to summary page when refreshing the empty repository page on a repository that is not empty (issue 129)
- Emit a warning in the log file if running on a Tomcat-based servlet container which is unfriendly to %2F forward-slash url encoding AND Gitblit is configured to mount parameters with %2F forward-slash url encoding (Github/jpyeron, issue 126)