mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-02 14:55:58 +01:00
34bc13bec7
Conflicts: build.gradle smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java |
||
---|---|---|
.. | ||
src | ||
.gitignore | ||
build.gradle |