1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-23 02:58:00 +01:00
Smack/smack-core
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
.gitignore Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
build.gradle Use Jid (and subclasses) from jxmpp-jid 2015-02-17 16:07:16 +01:00