aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-02-14 17:00:16 +0100
committerChristian S <christian@pix-art.de>2016-02-14 17:00:16 +0100
commit5e64737d532e493c00ab579ce8bd4695c4a5a5a2 (patch)
treeb82e1131467da94f4f3f58c51bf99dc26add4fc0 /CHANGELOG.md
parent1a6062cc17c421a66d7dbac0389dc7b3a19e3a5f (diff)
parent300326fba3a63fce546d952ac455758ed2cbeca0 (diff)
Merge branch 'siacs/master' into development
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cddca48e..8cb4b6f49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
###Changelog
+####Version 1.9.4
+* prevent cleared Conversations from reloading history with MAM
+* various MAM fixes
+
####Version 1.9.3
* expert setting that enables host and port configuration
* expert setting opt-out of bookmark autojoin handling