diff options
| author | Christian S <christian@pix-art.de> | 2016-01-23 12:30:02 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-23 12:30:02 +0100 |
| commit | 0196442c37d5d172ba75986495977bf16f3095dc (patch) | |
| tree | d1a549aa917b8ea5e30ae859f2df8ec399c0dcc0 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | 07d139decd7ed9f616b15539bbca00e244eb8a29 (diff) | |
| parent | ba98fe4f864a7e9df9b001a84c5c4126c9d107be (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
0 files changed, 0 insertions, 0 deletions