vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider
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
..
BytestreamsProvider.java Merge Smack 4.1.0-rc3 2015-03-07 21:31:56 +01:00