diff options
author | Kim Alvefur <zash@zash.se> | 2018-10-28 17:17:07 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-10-28 17:17:07 +0100 |
commit | 5d8bd2a789a52a5c927bc9a8a97c941870437fdd (patch) | |
tree | af3096423457e1ae0c3f73a919723bb0a21d3f5e /plugins/adhoc | |
parent | 031dc2e2a0450b25e16bbc534b29522e0ee52793 (diff) | |
parent | 1477498c413786a7c2b85492299833aa3a6c75b3 (diff) | |
download | prosody-5d8bd2a789a52a5c927bc9a8a97c941870437fdd.tar.gz prosody-5d8bd2a789a52a5c927bc9a8a97c941870437fdd.zip |
Merge 0.11->trunk
Diffstat (limited to 'plugins/adhoc')
0 files changed, 0 insertions, 0 deletions