mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-14 00:02:05 +01:00
01f08e87c2
Conflicts: smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java version.gradle |
||
---|---|---|
.. | ||
integration-test/java/org/jivesoftware/smackx | ||
main | ||
test |