Florian Schmaus 81002c4fbd Merge branch '4.2'		2017-11-22 08:37:47 +01:00
..
java/org/jivesoftware/smack	Merge branch '4.2'	2017-11-22 08:37:47 +01:00
resources/org.jivesoftware.smack.im	Added support for pre-approved subscription requests (RFC 6121 § 3.4)	2015-03-19 11:31:05 +01:00