mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-09-27 10:19:33 +02: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: |
||
---|---|---|
.. | ||
java/org/jivesoftware | ||
resources/org.jivesoftware.smack.extensions |