Florian Schmaus 9c30e4f3cc Merge branch '4.3'		2019-04-16 09:27:48 +02:00
..
java/org/jivesoftware/smackx	Merge branch '4.3'	2019-04-16 09:27:48 +02:00
resources/org.jivesoftware.smackx.ox	XEP-0373, XEP-0374: OpenPGP for XMPP: Instant Messaging	2018-07-29 18:52:45 +02:00