diff options
| author | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-07 18:32:51 +0100 |
|---|---|---|
| committer | Daniel Gultsch <inputmice@siacs.eu> | 2015-01-07 18:32:51 +0100 |
| commit | d70b5f93f3b779bf135b2bfe615093a810841dca (patch) | |
| tree | ad4f01d23f82c04b5398ef450107f2ef313b43d6 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | 0ad8796b4402cf9f39c6aede7873429cfcd0d4ad (diff) | |
| parent | 8ab19faddd10ca0c3aef0f47b618222ae24e79f6 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
0 files changed, 0 insertions, 0 deletions