Mercurial > prosody-hg
diff net/resolvers/service.lua @ 9598:dcd85bc34d21
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 30 Oct 2018 19:18:03 +0100 |
| parents | e09ddd061ec4 |
| children | e11e076f0eb8 94c9c574cd8a |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 30 Oct 2018 19:18:03 +0100 |
| parents | e09ddd061ec4 |
| children | e11e076f0eb8 94c9c574cd8a |