aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-01-13 17:48:30 +0100
committerChristian S <christian@pix-art.de>2016-01-13 17:48:30 +0100
commit4c2dc7082855581d875c51d97650c7b4a435abe5 (patch)
tree818ebaea4bfa9743e0acf85abc92afca7b51449a /CHANGELOG.md
parentc133b1d7e1cc9a3a3426d26e35cc038b508e1691 (diff)
parent3b3aa5b5841494ba02fe327f910558eb40e662b5 (diff)
Merge branch 'siacs/master' into development
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83505761f..1a746552f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
###Changelog
-####Versin 1.8.4
+####Version 1.9.0
+* Per conference notification settings
+* Let user decide whether to compress pictures
+* Support for XEP-0368
+* Ask user to exclude Conversations from battery optimizations
+
+####Version 1.8.4
* prompt to trust own OMEMO devices
* fixed rotation issues in avatar publication
* invite non-contact JIDs to conferences