aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/xmpp/httpuploadim
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-04-18 19:27:01 +0200
committersteckbrief <steckbrief@chefmail.de>2016-04-18 19:27:01 +0200
commit52fec558adb2b4d9bb3df314fd919570e7198e26 (patch)
tree524f316aaddd19363ef42be2cec660f4a50e56cd /src/main/java/de/thedevstack/conversationsplus/xmpp/httpuploadim
parent61149411c5141f2f9afe9b050ddce28c9d3df202 (diff)
parent7df96caedbbb96a28d4f7e07fa2d159c8ca1373f (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp/httpuploadim')
0 files changed, 0 insertions, 0 deletions