Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 9586:44dbee2f173f
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Oct 2018 17:17:07 +0100 |
| parents | 80dbb60d81e4 |
| children | ae2a11066001 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Oct 2018 17:17:07 +0100 |
| parents | 80dbb60d81e4 |
| children | ae2a11066001 |