Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 7282:29eedc776bbd
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 14 Mar 2016 18:27:32 +0100 |
| parents | bd0ff8ae98a8 |
| children | 200f1f6306a7 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 14 Mar 2016 18:27:32 +0100 |
| parents | bd0ff8ae98a8 |
| children | 200f1f6306a7 |