1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-13 07:04:49 +02:00
Smack/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams
Florian Schmaus 92a6d01507 Merge branch '4.0'
Also slightly improve OfflineMessageManager.getMessages()

Conflicts:
	build.gradle
	smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java
2014-08-07 16:51:03 +02:00
..
ibb Merge branch '4.0' 2014-07-14 14:31:09 +02:00
socks5 Merge branch '4.0' 2014-08-07 16:51:03 +02:00
BytestreamListener.java
BytestreamManager.java
BytestreamRequest.java
BytestreamSession.java