aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/xmpp
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-12 15:46:09 +0100
committerlookshe <github@lookshe.org>2016-03-12 15:46:09 +0100
commit2a486c667a0c81772fcf125c5c3c9b49c78250e3 (patch)
tree3bee0b26345feee9eeb477e45e4d443c52d832ca /src/main/java/de/thedevstack/conversationsplus/xmpp
parenta4444026444c75678db1663e01de05df225cd9ed (diff)
parent3041cc74cefb4a25f4d1af7109fcb141ec3293d8 (diff)
Merge branch 'trz/rebase' (early part) into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp')
0 files changed, 0 insertions, 0 deletions