From 765575db96ff1774d8c3dc60275f02919eea3cad Mon Sep 17 00:00:00 2001
From: MusikAnimal <musikanimal@gmail.com>
Date: Mon, 2 Oct 2017 10:12:17 -0400
Subject: [PATCH] 3.1.4 bump

---
 README.md              |  2 +-
 RELEASE_NOTES.md       | 11 +++++++++++
 app/config/config.yml  |  2 +-
 app/config/version.yml |  2 +-
 docs/conf.py           |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d3408d9a4..31e2ec74b 100755
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ To **report an issue**, create a ticket on [Phabricator](https://phabricator.wik
 
 [![release](https://img.shields.io/github/release/x-tools/xtools.svg)](https://github.com/x-tools/xtools/releases/latest)
 [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
-[![Build Status](https://travis-ci.org/x-tools/xtools.svg?branch=3.1.1)](https://travis-ci.org/x-tools/xtools)
+[![Build Status](https://travis-ci.org/x-tools/xtools.svg?branch=3.1.4)](https://travis-ci.org/x-tools/xtools)
 
 **Master:**
 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index afd79d7d7..22fb73fa2 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,16 @@
 # Release Notes #
 
+## 3.1.4 ##
+- T177172 Fix path to normalize project API endpoint
+- T174012 Rework "longest block" field in Edit Counter to show actual duration
+  of the block
+- T177168 Fix sorting of 'atbe' column in ArticleInfo
+- T177137 Add 'RotateLink' tool to AutoEdits
+- T177138 Add 'Hotcatcheck' tool to AutoEdits
+- T177140 Fix link to Global replace tool in AutoEdits
+- Include current URL in bug report link
+- Update all controllers to support routes of legacy XTools
+
 ## 3.1.3 ##
 - Hotfix for showing mainspace page titles in non-automated edits API endpoint
 
diff --git a/app/config/config.yml b/app/config/config.yml
index 0bb1038aa..22c9d48e8 100755
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -42,7 +42,7 @@ framework:
     fragments:       ~
     http_method_override: true
     assets:
-        version: '4'
+        version: '5'
         version_format: '%%s?v=%%s'
     cache:
         app: "cache.adapter.%cache.adapter%"
diff --git a/app/config/version.yml b/app/config/version.yml
index c5087b650..43283054a 100644
--- a/app/config/version.yml
+++ b/app/config/version.yml
@@ -2,4 +2,4 @@
 # The release process is documented at https://xtools.readthedocs.io/en/latest/development.html#releases
 
 parameters:
-  app.version: 3.1.3
+  app.version: 3.1.4
diff --git a/docs/conf.py b/docs/conf.py
index 42d2f3430..8fbe89b62 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -10,7 +10,7 @@
 # The release process is documented at https://xtools.readthedocs.io/en/latest/development.html#releases
 copyright = u'2008–2017, XTools contributors'
 version = '3.1'
-release = '3.1.3'
+release = '3.1.4'
 
 # -- Options for HTML output ---------------------------------------------------