From 11460461e7755cfc538d8775bf3e021c4068b1ba Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@sacfoodcoop.com>
Date: Tue, 23 Aug 2016 17:00:31 -0500
Subject: [PATCH] Update changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 3acbe445..c27d2f2a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,20 @@
 CHANGELOG
 =========
 
+0.5.25 (2016-08-23)
+-------------------
+
+* Tweak how we use DB session to fetch grid settings
+
+* Add "sub-rows" support to MasterView class
+
+* Refactor batch views to leverage MasterView sub-rows logic
+
+* Refactor batch view/edit pages to share some "execution options" logic
+
+* Add hook to customize timesheet shift rendering
+
+
 0.5.24 (2016-08-17)
 -------------------
 
diff --git a/tailbone/_version.py b/tailbone/_version.py
index a2e5e4c7..990f6718 100644
--- a/tailbone/_version.py
+++ b/tailbone/_version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = u'0.5.24'
+__version__ = u'0.5.25'