1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-18 09:24:49 +02:00
Smack/smack-extensions/src/main
Florian Schmaus 369878b6d9 Merge branch '4.1'
Conflicts:
	version.gradle
2015-03-11 20:51:08 +01:00
..
java/org/jivesoftware Merge branch '4.1' 2015-03-11 20:51:08 +01:00
resources/org.jivesoftware.smack.extensions Add VersionManager to startupClasses 2015-03-10 13:51:04 +01:00