mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-25 10:12:18 -05:00
02a89f4ce2
Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java |
||
---|---|---|
.. | ||
AbstractConnectionManager.java | ||
AvatarService.java | ||
EventReceiver.java | ||
MessageArchiveService.java | ||
NotificationService.java | ||
XmppConnectionService.java |