From 3789cf698a3f172263dc4004074818d4788c51d8 Mon Sep 17 00:00:00 2001
From: Tobias Reich <tobias.reich.ich@gmail.com>
Date: Wed, 6 May 2015 11:16:57 +0200
Subject: [PATCH] Added merge feature to changelog

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 2ab93d0..17b6e95 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -17,6 +17,7 @@ Released April ??, 2015
 - `New` Edit the sharing options of a public album
 - `New` Quickly switch between albums and photos by clicking the title in the header
 - `New` Renamed API functions
+- `New` Merge albums (Thanks @rhurling, #340, #341, #166)
 - `New` iPhone 6 Homescreen icon
 - `Improved` Performance of animations
 - `Improved` Prevent download of deleted albums/photos