vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-28 05:28:00 +01:00
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main
History
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
..
java/org/jivesoftware Merge branch '4.4' 2021-08-23 18:02:00 +02:00
resources/org.jivesoftware.smack.extensions [bob] Add BoBDataExtension, remove BoBExtension 2020-09-23 19:57:13 +02:00