From 8666197e05c13f1d2b5c85f58d72bf1f31f4c67d Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 18 Dec 2016 10:48:05 +0100
Subject: [PATCH] Changelog and version bump.

---
 CHANGELOG.md       | 12 ++++++++++++
 config/firefly.php |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e688d23b82..107e66c744 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.2.2] - 2016-12-18
+### Added
+- New budget report (still a bit of a beta)
+- Can now edit user
+
+### Changed
+- New config for specific events. Still need to build Notifications.
+
+### Fixed
+- Various bugs
+- Issue #472 thanks to @zjean
+
 ## [4.2.1] - 2016-12-09
 ### Added
 - BIC support (see #430)
diff --git a/config/firefly.php b/config/firefly.php
index 07fdd04ee1..d48a4299cf 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -29,7 +29,7 @@ return [
         'mail_for_blocked_login'  => false,
     ],
     'chart'               => 'chartjs',
-    'version'             => '4.2.1',
+    'version'             => '4.2.2',
     'csv_import_enabled'  => true,
     'maxUploadSize'       => 5242880,
     'allowedMimes'        => ['image/png', 'image/jpeg', 'application/pdf'],