mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2025-12-06 21:21:08 +01:00
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 | ||