diff options
author | Kim Alvefur <zash@zash.se> | 2014-09-02 22:34:32 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-09-02 22:34:32 +0200 |
commit | d21a5e46225b9b62b78cd7eeee1ed6869ef9efa0 (patch) | |
tree | 5ae5bb832b9e41b4812e12421bb70daf1c3b7446 /plugins/adhoc/adhoc.lib.lua | |
parent | 6594e3042b1afd3ecf39c841c6e631fa57f1ad18 (diff) | |
parent | ab57f00b936342c599aadf901f85e5b29ee91baa (diff) | |
download | prosody-d21a5e46225b9b62b78cd7eeee1ed6869ef9efa0.tar.gz prosody-d21a5e46225b9b62b78cd7eeee1ed6869ef9efa0.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/adhoc/adhoc.lib.lua')
0 files changed, 0 insertions, 0 deletions