Mercurial > prosody-hg
diff plugins/mod_disco.lua @ 5896:019130907a07
Merge 0.9 -> 0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:47:57 +0100 |
| parents | bd0ff8ae98a8 |
| children | 200f1f6306a7 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:47:57 +0100 |
| parents | bd0ff8ae98a8 |
| children | 200f1f6306a7 |