vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main
History
Florian Schmaus 3e18a23e47 Merge branch '4.0' 
Conflicts:
	build.gradle
	smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
 		2014-06-07 12:24:51 +02:00
..
java/org/jivesoftware Merge branch '4.0' 2014-06-07 12:24:51 +02:00
resources/org.jivesoftware.smackx Reworked OSGi support of Smack (SMACK-343) 2014-05-15 16:09:37 +02:00