diff options
author | Kim Alvefur <zash@zash.se> | 2016-11-05 00:28:30 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-11-05 00:28:30 +0100 |
commit | 07da428d332ef485dc4aea2f14cde5642fb0ba78 (patch) | |
tree | ead046279a47ea5984c334f0c6500d85f5970dc8 /util/adhoc.lua | |
parent | 78fdfac11b141a83604a2887bb831206f71bef54 (diff) | |
parent | 02919f09518951d7561b8adbb843e88c6fc262ac (diff) | |
download | prosody-07da428d332ef485dc4aea2f14cde5642fb0ba78.tar.gz prosody-07da428d332ef485dc4aea2f14cde5642fb0ba78.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/adhoc.lua')
0 files changed, 0 insertions, 0 deletions