From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result

---
 src/site/upgrade_express.mkd |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/site/upgrade_express.mkd b/src/site/upgrade_express.mkd
index 103cfc9..374cd82 100644
--- a/src/site/upgrade_express.mkd
+++ b/src/site/upgrade_express.mkd
@@ -6,9 +6,13 @@
 
 These steps are necessary to ensure that you end up using the specified libraries and resources for the new version.  Otherwise you could end up with a hybrid filesystem that would make it difficult to troubleshoot.  It is important to note that the web.xml file contains both your default settings AND application configuration.  Not updating the web.xml is just a likely to create problems as making a hybrid filesystem.
 
+### 1.3.1 web.xml
+
+- Changed *WicketFilter* to *GitblitWicketFilter* to handle optional, smart cache-control updates (issue-274)
+
 ### 1.3.0 web.xml
 
 - Added LogoServlet
 - Added SparkleShareInviteServlet
 - Added EnforceAuthenticationFilter
-- Moved GitServlet
\ No newline at end of file
+- Moved GitServlet

--
Gitblit v1.9.1