From 53b801f033ef32c1daa84ff21648806291c15824 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Tue, 15 Apr 2014 12:29:53 -0700
Subject: [PATCH] changelog

(cherry picked from commit 033586dd526012252df8b26ab3515d12ab8d228f)
---
 hledger-web/CHANGES | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hledger-web/CHANGES b/hledger-web/CHANGES
index 824ea79f0..7816213e6 100644
--- a/hledger-web/CHANGES
+++ b/hledger-web/CHANGES
@@ -1,6 +1,8 @@
-(unreleased)
+0.22.5 (2014/4/15)
 
-- allow warp 2.1
+- allow http-client 0.3.*, fixing cabal install again with GHC <= 7.6 (not yet 7.8)
+- use pretty-show only with GHC 7.4+, fixing GHC 7.2 (fixes #155)
+- allow warp 2.1, fixing cabal install
 
 0.22.4 (2014/2/10)