aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/adhoc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-22 14:39:14 +0200
committerKim Alvefur <zash@zash.se>2016-05-22 14:39:14 +0200
commit288422c9c30c40727577f896b55596b40e0120f6 (patch)
treef99ef2519cdcd995afdd7e952580485a6ab6a607 /plugins/adhoc
parentbaba98852da626da819c230e0a19385a0a885802 (diff)
parent2b1cedaf7ab92f6d549f61244802886b18a2e8ed (diff)
downloadprosody-288422c9c30c40727577f896b55596b40e0120f6.tar.gz
prosody-288422c9c30c40727577f896b55596b40e0120f6.zip
Merge 0.9->0.10
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions