mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-22 18:48:00 +01:00
001985647a
This also fixes a errornous merge where the same branch with different commit was merged into master and 4.4 The conflicting commits are 4.4: |
||
---|---|---|
.. | ||
integration-test/java/org/jivesoftware/smackx | ||
main | ||
test | ||
testFixtures/java/org/jivesoftware/util |