Mercurial > prosody-hg
comparison plugins/mod_disco.lua @ 6081:19ada596aec4
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 15 Apr 2014 20:36:39 +0200 |
| parents | bd0ff8ae98a8 |
| children | 200f1f6306a7 |
comparison
equal
deleted
inserted
replaced
| 6072:ce5428f6e3c3 | 6081:19ada596aec4 |
|---|
