diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2017-01-15 18:55:15 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2017-01-15 18:55:15 +0100 |
| commit | 9bdd2bf1ae38ee688538d7d4a0e446c3b869d47e (patch) | |
| tree | 304e1b91ca5faff5785eea92964deb4d991d42e4 /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |
| parent | d028f4b3989f6cf44e5bbff28dcf80f152304f5f (diff) | |
| parent | ebf8ae231ad991a811defbe0a94b6d57c432454e (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')
0 files changed, 0 insertions, 0 deletions