1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Smack/smack-extensions/src
Florian Schmaus 001985647a Merge branch '4.4'
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:
8f760eaeb3  getRawValueCharSequences
e626580f68

master:
b47225c2c1  getRawValues
097d245358
2021-08-23 18:02:00 +02:00
..
integration-test/java/org/jivesoftware/smackx s/occured/occurred/ 2019-10-30 12:02:36 +01:00
main Merge branch '4.4' 2021-08-23 18:02:00 +02:00
test [time] Use IqBuilder pattern and improve API 2021-05-02 17:16:58 +02:00
testFixtures/java/org/jivesoftware/util Call XMPPConnection.sendIqRequestAndWaitForResponse(IQ) where possible 2021-05-12 10:12:40 +02:00