Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 7256:9fbb9fbf7e52
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 09 Mar 2016 13:19:38 +0000 |
| parents | 80923a1a8fe1 |
| children | cde4ef90cf3d |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 09 Mar 2016 13:19:38 +0000 |
| parents | 80923a1a8fe1 |
| children | cde4ef90cf3d |