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
..
caps.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
dataforms.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
disco.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
filetransfer.md	Merge branch '4.0'	2014-08-16 00:30:28 +02:00
hoxt.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
index.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
intro.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
invitation.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
messageevents.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
muc.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
privacy.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
privatedata.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
properties.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
pubsub.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
rosterexchange.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
time.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00
xhtml.md	Convert html documentation to markdown	2014-08-16 00:11:14 +02:00