From 1111c3d1b1982fafa86caa3146991c72aa123edd Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Mon, 2 Dec 2019 10:32:06 -0700
Subject: [PATCH] prepare for release

---
 CHANGELOG.md       | 4 +++-
 system/defines.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb92473b3..b4c5d27c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,12 @@
 # v1.6.18
-## mm/dd/2019
+## 12/02/2019
 
 1. [](#bugfix)
     * PHP 7.4 fix in `Pages::buildSort()`
+    * Updated vendor libraries for PHP 7.4 fixes in Twig and other libraries
     * Fixed fatal error when `$page->id()` is null [#2731](https://github.com/getgrav/grav/pull/2731)
     * Fixed cache conflicts on pages with no set id
+    * Fix rewrite rule for for `lighttpd` default config [#721](https://github.com/getgrav/grav/pull/2721)
 
 # v1.6.17
 ## 11/06/2019
diff --git a/system/defines.php b/system/defines.php
index 5a283c40a..8c9ca2c2f 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -8,7 +8,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.6.17');
+define('GRAV_VERSION', '1.6.18');
 define('GRAV_TESTING', false);
 define('DS', '/');