Smack/smack-extensions/src/main/java/org/jivesoftware
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
..
smack [chat2] Fix resource unlock condition 2021-03-25 08:22:12 +01:00
smackx Merge branch '4.4' 2021-08-23 18:02:00 +02:00