From 116c279f01e55d732e99dff7cd4cc1d1f5b44dab Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 12 Nov 2018 15:55:29 -0700
Subject: [PATCH 1/2] update changelog

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4dda8845..1b43c8fb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v1.5.5
+## 11/12/2018
+
+1. [](#new)
+    * Register theme prefixes as namespaces in Twig [#2210](https://github.com/getgrav/grav/pull/2210)
+1. [](#improved)
+    * Propogate error code between 400 and 600 for production sites [#2181](https://github.com/getgrav/grav/pull/2181)
+1. [](#bugfix)
+    * Remove hardcoded `302` when redirecting trailing slash [#2155](https://github.com/getgrav/grav/pull/2155)
+
 # v1.5.4
 ## 11/05/2018
 

From 377751416b5897953f1a25ed9ea7550f7b8fab34 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 12 Nov 2018 15:56:04 -0700
Subject: [PATCH 2/2] Prepare for release

---
 system/defines.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/defines.php b/system/defines.php
index 713bdbac4..001d88649 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -8,7 +8,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.5.4');
+define('GRAV_VERSION', '1.5.5');
 define('GRAV_TESTING', false);
 define('DS', '/');