diff options
| author | Christian S <christian@pix-art.de> | 2016-04-23 10:07:07 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-23 10:07:07 +0200 |
| commit | e9e796d185b106dafca6d7dc5093929c0bbe6dea (patch) | |
| tree | f097ef78ed3c9ffce7df1fc13ddcdd73fe964e2f /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |
| parent | be25b0509b66cd3fbb760059ca0085488fe32224 (diff) | |
| parent | 195b745efc0747e930a639d2c89d4c3a79e0a3c2 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')
0 files changed, 0 insertions, 0 deletions