diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-03 11:52:22 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-03 11:52:22 +0100 |
commit | 2ca03f1a40ea0854e0dda798b82e31c558eed578 (patch) | |
tree | 85f43927206b44fd97ccc98872d483a4269c2f0f /util/adhoc.lua | |
parent | 8407f360939fe103a991641b0bf3b85e87d660b9 (diff) | |
parent | c284110cb40cb2347f82e974f76eb6bc6927e946 (diff) | |
download | prosody-2ca03f1a40ea0854e0dda798b82e31c558eed578.tar.gz prosody-2ca03f1a40ea0854e0dda798b82e31c558eed578.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/adhoc.lua')
0 files changed, 0 insertions, 0 deletions