diff options
| author | lookshe <github@lookshe.org> | 2016-03-25 20:06:01 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-25 20:06:01 +0100 |
| commit | d25ab854dae2be0d5286d46b5038494d503dd367 (patch) | |
| tree | bb193482c85fad96206ad1b225013e6d27eaa7e7 /src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java | |
| parent | f306292ed68c003621b53065dd70e499e074e748 (diff) | |
| parent | 86d16b030b46aca24e6fab38e5d34beb503a6dc7 (diff) | |
Merge branch 'trz/rebase' (early part) into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java')
0 files changed, 0 insertions, 0 deletions