aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/adhoc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-02 23:06:27 +0200
committerKim Alvefur <zash@zash.se>2017-04-02 23:06:27 +0200
commitb20964f83264e0f01132fcb09723e28c65f73fab (patch)
tree358e773c362310c340614ec2915410dc3f490367 /plugins/adhoc
parent4aca019397008f0d14d445709610954e6cd56ad4 (diff)
parentbf96691bcc7ceeef346906259ebe901c09a6e876 (diff)
downloadprosody-b20964f83264e0f01132fcb09723e28c65f73fab.tar.gz
prosody-b20964f83264e0f01132fcb09723e28c65f73fab.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions