vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main
History
Florian Schmaus 01f08e87c2 Merge branch '4.1' 
Conflicts:
	smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
	version.gradle
 		2015-05-24 22:36:11 +02:00
..
java/org/jivesoftware Merge branch '4.1' 2015-05-24 22:36:11 +02:00
resources/org.jivesoftware.smack.extensions Add MucBookmarkAutojoinManager 2015-04-21 19:31:10 +02:00