mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-06-29 06:44:50 +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: |
||
---|---|---|
.. | ||
cache | ||
packet | ||
provider | ||
CapsVersionAndHash.java | ||
EntityCapsManager.java | ||
package-info.java |