mirror of
https://github.com/vanitasvitae/Smack.git
synced 2025-12-05 10:31:08 +01:00
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 | ||