Florian Schmaus 3c4225d167 Merge branch '4.2'		2017-12-25 14:16:43 +01:00
..
java/org/jivesoftware/smack	Merge branch '4.2'	2017-12-25 14:16:43 +01:00
resources/org.jivesoftware.smack	Add OMEMO support	2017-06-02 13:40:10 +02:00