vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-legacy/src/main/java/org/jivesoftware
History
Florian Schmaus 2079ba6bd6 Merge branch '4.1' 
Conflicts:
	smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
	smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
 		2015-05-27 22:50:55 +02:00
..
smack/legacy Add JavadocPackage checkstyle 2015-04-04 17:16:47 +02:00
smackx Merge branch '4.1' 2015-05-27 22:50:55 +02:00