aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-04-05 23:25:52 +0200
committerlookshe <github@lookshe.org>2016-04-05 23:25:52 +0200
commit6899b9b01e416da95b9006d9f23bf1e1214f607d (patch)
treefcf7fed9ec068921b350a0d8c062cfec2c81a167 /src/main/java/de/thedevstack/conversationsplus/xmpp/jingle
parentf82adbac65f30b62c3d5edae29609bcf41a35fac (diff)
parentbfb3cb844578d06fad9aade3a7576ee44d785f70 (diff)
Merge branch 'trz/rebase' (early part) into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/jingle')
0 files changed, 0 insertions, 0 deletions