vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-30 14:37:59 +01:00
Code Issues Releases Wiki Activity
Smack/smack-core/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/smack Merge branch '4.1' 2015-05-24 22:36:11 +02:00
resources/org.jivesoftware.smack Create smack-im subproject for XMPP-IM 2015-01-26 07:54:05 +01:00