diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-05-17 19:33:55 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-05-17 19:33:55 +0200 |
| commit | c07d3deea344c91bfea11fb7f2e37bc4172968e7 (patch) | |
| tree | fe9a0acd0fbd30d37c561f0dcc55d99995a1824e /src/eu/siacs/conversations/xmpp/XmppConnection.java | |
| parent | 736e09fbb56fbdc4aca4e9bdc9875a5df60cb562 (diff) | |
| parent | ae6c99012e4f26ec109233e4d29f4bd0c1eca5ea (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'src/eu/siacs/conversations/xmpp/XmppConnection.java')
0 files changed, 0 insertions, 0 deletions