vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-bosh/src/main
History
Florian Schmaus 24f7de8d54 Merge branch '4.0' 
Conflicts:
	build.gradle
 		2014-08-19 11:32:57 +02:00
..
java/org/jivesoftware/smack/bosh Merge branch '4.0' 2014-08-19 11:32:57 +02:00