diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-24 13:11:24 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-24 13:11:24 +0100 |
| commit | 2803cbda260b54397edf34befaf8a29e55ffde30 (patch) | |
| tree | c95322c0b408aa91ec15e3d34ad9423388878816 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | 8b0ffd048e39b928d4bdbd964e1a89735c358e80 (diff) | |
Fixes FS#89 after merge conflict
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
0 files changed, 0 insertions, 0 deletions