mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-12-27 14:47:59 +01:00
057d00c9de
SMACK-586 Conflicts: smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java |
||
---|---|---|
.. | ||
main/java/org/jivesoftware/smack/tcp | ||
test/java/org/jivesoftware/smack/tcp |