aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/adhoc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-14 17:38:50 +0100
committerKim Alvefur <zash@zash.se>2016-03-14 17:38:50 +0100
commitde0076f16c510ebbfaedf17884e6248b42b599ca (patch)
treeb5a38a6a817aa63528bdc225aa207006faf12f5e /plugins/adhoc
parent3ec49d31afc719ec2bec5dee640e41c11f52fe62 (diff)
parentab4f0cf7c4d64e331789ed11792796bd043fc940 (diff)
downloadprosody-de0076f16c510ebbfaedf17884e6248b42b599ca.tar.gz
prosody-de0076f16c510ebbfaedf17884e6248b42b599ca.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions