1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-16 00:24:49 +02:00
Smack/smack-extensions/src/main
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
..
java/org/jivesoftware Merge Smack 4.1.0-rc3 2015-03-07 21:31:56 +01:00
resources/org.jivesoftware.smack.extensions Improve Message Delivery Receipt (XEP-184) API 2015-01-20 12:43:11 +01:00