From 19029519fef8cbfdf041b7f9029ad3e201195286 Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@sacfoodcoop.com>
Date: Wed, 12 Aug 2015 01:14:54 -0500
Subject: [PATCH] Update changelog.

---
 CHANGES.rst          | 12 ++++++++++++
 tailbone/_version.py |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c3c065aa..6bb4eaea 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,5 +1,17 @@
 .. -*- coding: utf-8 -*-
 
+0.4.18
+------
+
+* Don't show flash message when user logs in.
+
+* Add core JS/CSS to base template; use CDN instead of cached files.
+
+* Add support for "new-style grids" and "model master views", and convert the
+  following views to use it: roles, users, label profiles, settings.  Also
+  overhaul how permissions are registered in app config.
+
+
 0.4.17
 ------
 
diff --git a/tailbone/_version.py b/tailbone/_version.py
index 7bb6aaa4..e9b92c66 100644
--- a/tailbone/_version.py
+++ b/tailbone/_version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = u'0.4.17'
+__version__ = u'0.4.18'