1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-24 11:38:00 +01:00
Smack/smack-core/src/main
Florian Schmaus 369878b6d9 Merge branch '4.1'
Conflicts:
	version.gradle
2015-03-11 20:51:08 +01:00
..
java/org/jivesoftware/smack Merge branch '4.1' 2015-03-11 20:51:08 +01:00
resources/org.jivesoftware.smack Create smack-im subproject for XMPP-IM 2015-01-26 07:54:05 +01:00