Daniel Gultsch 432598f896 Merge branch 'bugfixes'		2017-07-23 07:53:09 +02:00
..
axolotl	made omemo always available but in public mucs	2017-07-18 12:51:15 +02:00
sasl
OtrService.java	add explicit encryption hints to outgoing messages	2017-01-26 19:19:08 +01:00
PgpDecryptionService.java	treat URL as file if URL is in oob or contains key	2017-04-05 22:35:42 +02:00
PgpEngine.java	display open pgp key id in account details and allow to delete. fixes #2470	2017-05-04 13:02:46 +02:00
XmppDomainVerifier.java	made OF selfSigned() workaround only available >=kitkat	2017-07-23 07:47:39 +02:00