mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-25 12:08:00 +01:00
7735a5224c
Conflicts: smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java |
||
---|---|---|
.. | ||
jivesoftware |