aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/adhoc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-09 20:30:04 +0100
committerKim Alvefur <zash@zash.se>2014-11-09 20:30:04 +0100
commit486335f3dbc84dacf253120f544f1d2ee026cf94 (patch)
tree97f78b366acac27667ddfb525a3a5aeabd37ddcf /plugins/adhoc
parent090d1d01f4336cb3171631a429c40ec286065642 (diff)
parentc68bed48e932da73335c40f3721656dab067cf98 (diff)
downloadprosody-486335f3dbc84dacf253120f544f1d2ee026cf94.tar.gz
prosody-486335f3dbc84dacf253120f544f1d2ee026cf94.zip
Merge 0.9 -> 0.10
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions