vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-23 02:58:00 +01:00
Code Issues Releases Wiki Activity
Smack/smack-extensions/src
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
..
integration-test/java/org/jivesoftware/smackx Rename 'serviceName' to 'xmppServiceDomain' 2015-05-19 09:26:59 +02:00
main Merge branch '4.1' 2015-05-24 22:36:11 +02:00
test Rename 'serviceName' to 'xmppServiceDomain' 2015-05-19 09:26:59 +02:00