Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 8909:dbb5ec6885fe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 10 Jun 2018 17:56:38 +0200 |
| parents | b0093d3b2d04 |
| children | 80dbb60d81e4 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 10 Jun 2018 17:56:38 +0200 |
| parents | b0093d3b2d04 |
| children | 80dbb60d81e4 |