diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-10 03:57:17 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-10 03:57:17 +0100 |
commit | 0f30c79999e4572c62f8f5bdfd29771b746db8d3 (patch) | |
tree | 64202f4daef595ff51640c1810fbb2751775faa4 /util/adhoc.lua | |
parent | fb972a1ea95f574ecacd7a213a04c4cab5e41f56 (diff) | |
parent | 596cd6813cca26de9864a92650b04aa90d4af3c3 (diff) | |
download | prosody-0f30c79999e4572c62f8f5bdfd29771b746db8d3.tar.gz prosody-0f30c79999e4572c62f8f5bdfd29771b746db8d3.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/adhoc.lua')
0 files changed, 0 insertions, 0 deletions