vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-29 23:42:06 +01:00
Code Issues Releases Wiki Activity
Smack/smack-legacy/src
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
..
main Merge branch '4.1' 2015-05-27 22:50:55 +02:00
test/java/org/jivesoftware/smackx Remove package-info.java from test packages 2015-04-05 10:48:00 +02:00