diff options
author | Kim Alvefur <zash@zash.se> | 2015-05-14 00:24:21 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-05-14 00:24:21 +0200 |
commit | 6b32fb12b118afd85c6efbf35187a9298ace9167 (patch) | |
tree | 887ef8ce4128251eb52ba5753584e8262a89d492 /plugins/adhoc/mod_adhoc.lua | |
parent | 068e6374d06f4ba750195da7f6212a1a6ac72636 (diff) | |
parent | 26b55b19d692b66c9f09a933c419641af863e94a (diff) | |
download | prosody-6b32fb12b118afd85c6efbf35187a9298ace9167.tar.gz prosody-6b32fb12b118afd85c6efbf35187a9298ace9167.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc/mod_adhoc.lua')
0 files changed, 0 insertions, 0 deletions