Smack/documentation
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
..
extensions Merge branch '4.0' 2014-08-16 00:30:28 +02:00
images Extension was renamed to lowercase. 2004-08-19 17:17:40 +00:00
legacy Move "Message Events (XEP-22)" code to legacy 2014-07-16 12:01:03 +02:00
connections.md Convert html documentation to markdown 2014-08-16 00:11:14 +02:00
debugging.md Convert html documentation to markdown 2014-08-16 00:11:14 +02:00
gettingstarted.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
messaging.md Convert html documentation to markdown 2014-08-16 00:11:14 +02:00
overview.md Convert html documentation to markdown 2014-08-16 00:11:14 +02:00
processing.md Convert html documentation to markdown 2014-08-16 00:11:14 +02:00
providers.md Convert html documentation to markdown 2014-08-16 00:11:14 +02:00
roster.md Convert html documentation to markdown 2014-08-16 00:11:14 +02:00