From d62d883423c4f13e9514c203d2f0b14e4715df7f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 23 May 2014 09:19:01 -0400
Subject: [PATCH] Tag server-side merges when incremental push tags are enabled

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

diff --git a/src/site/upgrade_express.mkd b/src/site/upgrade_express.mkd
index 103cfc9..9e1eed9 100644
--- a/src/site/upgrade_express.mkd
+++ b/src/site/upgrade_express.mkd
@@ -6,9 +6,18 @@
 
 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
+
+### 1.4.0 web.xml
+
+- Changed baseFolder from a context-parameter to a JNDI env-entry
+- Added pt servlet
\ No newline at end of file

--
Gitblit v1.9.1