Florian Schmaus 3bdeca44f2 Merge branch '4.2'		2018-02-23 18:35:34 +01:00
..
java/org/jivesoftware/smack	Merge branch '4.2'	2018-02-23 18:35:34 +01:00
resources/org.jivesoftware.smack	Add OMEMO support	2017-06-02 13:40:10 +02:00