vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-14 23:54:49 +02:00
Code Issues Releases Wiki Activity
Smack/smack-extensions/src
History
Florian Schmaus 34bc13bec7 Merge branch '4.0' 
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
2014-09-05 22:11:35 +02:00
..
integration-test/java/org/jivesoftware/smackx Merge branch '4.0' 2014-07-05 14:37:22 +02:00
main Merge branch '4.0' 2014-09-05 22:11:35 +02:00
test Add support for multiple status codes to MUCUser 2014-09-05 11:45:06 +02:00