1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-23 03:44:50 +02:00
Smack/smack-bosh/src/main/java
Florian Schmaus 24f7de8d54 Merge branch '4.0'
Conflicts:
	build.gradle
2014-08-19 11:32:57 +02:00
..
org/jivesoftware/smack/bosh Merge branch '4.0' 2014-08-19 11:32:57 +02:00