Mercurial > prosody-hg
diff util/prosodyctl.lua @ 7798:74cfec1fe5a2
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 01 Jan 2017 19:35:06 +0100 |
| parents | 5e18416881bb |
| children | bd591c5fc1bf |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 01 Jan 2017 19:35:06 +0100 |
| parents | 5e18416881bb |
| children | bd591c5fc1bf |