From 2fe9bbecdb33dbdfaf4679569d11806c4d082b80 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 12 May 2014 15:05:32 +0200
Subject: [PATCH] added changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbb9576e9f0b6225e37b0f8ee406daeaf251c592..ecfd13f5123cd006f1ce6f055af1c0805e26f651 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * Image file transfer
 * Better integration with OpenKeychain (PGP encryption)
 * Nicer conversation tiles for conferences
+* Ability to clear conversation history
 * A lot of bug fixes and code clean up
 
 ####Version 0.1.3