1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 16:22:06 +01:00
Smack/smack-extensions/src/main
Florian Schmaus 4a16ab9329 Merge branch '4.1'
Conflicts:
	version.gradle
2015-04-12 18:32:55 +02:00
..
java/org/jivesoftware Merge branch '4.1' 2015-04-12 18:32:55 +02:00
resources/org.jivesoftware.smack.extensions Merge branch '4.1' 2015-03-24 17:16:18 +01:00