1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-19 21:12:05 +01:00
Smack/smack-legacy/src/main/java/org/jivesoftware
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