Florian Schmaus c540ac9703 Merge Smack 4.1.0-rc3 ... Conflicts: smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java version.gradle		2015-03-07 21:31:56 +01:00
..
src	Merge Smack 4.1.0-rc3	2015-03-07 21:31:56 +01:00
build.gradle	Create smack-im subproject for XMPP-IM	2015-01-26 07:54:05 +01:00