diff options
author | Kim Alvefur <zash@zash.se> | 2018-03-10 20:52:14 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-03-10 20:52:14 +0100 |
commit | 14b65a9175c53c637d03966c9172a9c5b96c5da4 (patch) | |
tree | e8c202f79d28d3aa921bb5d417233477e387f32a /net/resolvers/basic.lua | |
parent | 7bb23790b3b9162909b9bb0af779b0327f5a3fda (diff) | |
parent | 8eaef0235b3b51d64b79f6dd0a740644f2c0841e (diff) | |
download | prosody-14b65a9175c53c637d03966c9172a9c5b96c5da4.tar.gz prosody-14b65a9175c53c637d03966c9172a9c5b96c5da4.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/resolvers/basic.lua')
0 files changed, 0 insertions, 0 deletions