vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-23 04:22:05 +01:00
Code Issues Releases Wiki Activity
Smack/smack-core/src
History
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
..
integration-test Add XMPPConnection.sendStanza(Stanza) 2015-03-04 21:46:44 +01:00
main Merge Smack 4.1.0-rc3 2015-03-07 21:31:56 +01:00
test Merge branch '4.1' 2015-03-04 22:42:36 +01:00