vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-12-20 17:47:57 +01:00
Code Issues Releases Wiki Activity
2712 commits 61 branches 35 tags 39 MiB
Commit graph

2 commits

Author SHA1 Message Date
Florian Schmaus
397eb88468 Merge branch '4.0' 
Conflicts:
	build.gradle
	documentation/connections.html
	documentation/debugging.html
	documentation/extensions/filetransfer.html
	documentation/extensions/rosterexchange.html
	documentation/gettingstarted.html
	documentation/index.html
	documentation/legacy/messageevents.html
	smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
 2014-08-16 00:30:28 +02:00
Florian Schmaus
344148eaed Convert html documentation to markdown 2014-08-16 00:11:14 +02:00