aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/xmpp
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-01-15 13:58:07 +0100
committersteckbrief <steckbrief@chefmail.de>2016-01-15 13:58:07 +0100
commit424477dfbc84f12af8223b004692d84b0d3ea5aa (patch)
treeadc7a5b312b6a95629531d83bcd09391c6d0832f /src/main/java/de/thedevstack/conversationsplus/xmpp
parent63a40ed65fb16ead440de52fb8bd26c523b75b82 (diff)
parent1f40166b3105ab78ce02339b16c9cb9eea921ec7 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/xmpp')
0 files changed, 0 insertions, 0 deletions