Mercurial > prosody-hg
comparison plugins/muc/mod_muc.lua @ 7269:cde4ef90cf3d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 11 Mar 2016 13:41:10 +0100 |
| parents | 80923a1a8fe1 f0a2a305b788 |
| children | 24e2369b67f9 |
comparison
equal
deleted
inserted
replaced
| 7263:015a711a8ccf | 7269:cde4ef90cf3d |
|---|
