aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-05-15 00:12:47 +0200
committerChristian Schneppe <christian@pix-art.de>2016-05-15 00:12:47 +0200
commit6376e5fd74dd199b5ab0f71686adff65c05798a6 (patch)
tree14979a4f3428fdb77b56b01bc2aff9d308eb1e5e /CHANGELOG.md
parent977a770b818d9b40a93d2acd13b6b5d5c874172d (diff)
parent018f978a22b7314b21b83c40d8741a811ffc55bf (diff)
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26ab8aa39..11f08d667 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
###Changelog
####Version 1.12.2
+* make omemo default when all resources support it
+* show presence of other resources as template
+* start typing in StartConversationsActivity to search
+* show addresses in locations
+* various bug fixes and improvements
* fixed pgp presence signing
####Version 1.12.1