vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-22 10:37:59 +01:00
Code Issues Releases Wiki Activity
Smack/smack-core
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
..
src Merge branch '4.1' 2015-05-24 22:36:11 +02:00
.gitignore Prefix subprojects with 'smack-' 2014-04-28 19:44:14 +02:00
build.gradle Add Integration Test Framework 2015-03-18 11:09:56 +01:00