aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-25 20:06:01 +0100
committerlookshe <github@lookshe.org>2016-03-25 20:06:01 +0100
commitd25ab854dae2be0d5286d46b5038494d503dd367 (patch)
treebb193482c85fad96206ad1b225013e6d27eaa7e7 /src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
parentf306292ed68c003621b53065dd70e499e074e748 (diff)
parent86d16b030b46aca24e6fab38e5d34beb503a6dc7 (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