d06d5b7c69
Conflicts: build.gradle |
||
---|---|---|
.. | ||
java/org/jivesoftware/smack | ||
resources/org.jivesoftware.smack |
d06d5b7c69
Conflicts: build.gradle |
||
---|---|---|
.. | ||
java/org/jivesoftware/smack | ||
resources/org.jivesoftware.smack |