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 |