24f7de8d54
Conflicts: build.gradle |
||
---|---|---|
.. | ||
main/java/org/jivesoftware/smack/tcp | ||
test/java/org/jivesoftware/smack/tcp |
24f7de8d54
Conflicts: build.gradle |
||
---|---|---|
.. | ||
main/java/org/jivesoftware/smack/tcp | ||
test/java/org/jivesoftware/smack/tcp |