1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-19 18:04:49 +02:00
Smack/smack-extensions/src
Florian Schmaus 50e068b6a7 Merge branch '4.0'
Conflicts:
	build.gradle
2014-09-29 14:00:48 +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-29 14:00:48 +02:00
test Add support for XEP-0059: Result Set Management 2014-09-13 12:28:18 +02:00