1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-09-29 03:09:33 +02:00
Smack/smack-extensions/src/main/java/org/jivesoftware
Florian Schmaus 50e068b6a7 Merge branch '4.0'
Conflicts:
	build.gradle
2014-09-29 14:00:48 +02:00
..
smack/initializer/extensions Reworked OSGi support of Smack (SMACK-343) 2014-05-15 16:09:37 +02:00
smackx Merge branch '4.0' 2014-09-29 14:00:48 +02:00