vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-22 20:12:07 +01:00
Code Issues Releases Wiki Activity
Smack/smack-im
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
..
src Merge branch '4.1' 2015-05-27 22:50:55 +02:00
build.gradle Create smack-im subproject for XMPP-IM 2015-01-26 07:54:05 +01:00