Added frm to default pretty print extensions (issue 156)

diff --git a/distrib/gitblit.properties b/distrib/gitblit.properties
index 411699ff91472d752d9abfe71ce3e68fdf5b2761..60b1a897db6e24012ea745a0e78e5cddb56d35e4 100644 (file)
--- 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
 #\r
 # SPACE-DELIMITED\r
 # SINCE 0.5.0\r
-web.prettyPrintExtensions = c cpp cs css htm html java js php pl prefs properties py rb sh sql xml vb\r
+web.prettyPrintExtensions = c cpp cs css frm htm html java js php pl prefs properties py rb sh sql xml vb\r
 \r
 # Registered extensions for markdown transformation\r
 #\r

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index 5e5eb6a227b97fa8fcc1ac231807d71717748a3d..9d721f928cff78f273bc3363e0ae88a3755b2ea7 100644 (file)
--- 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
 \r
 - Teams can now specify the *admin*, *create*, and *fork* roles to simplify user administration\r
 - Use https Gravatar urls to avoid browser complaints\r
+- Added frm to default pretty print extensions (issue 156)\r
 - Expose ReceivePack to Groovy push hooks (issue 125)\r
 - Redirect to summary page when refreshing the empty repository page on a repository that is not empty (issue 129)\r
 - 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)\r