Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 7013:f387fae9fb31
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 16 Dec 2015 16:47:34 +0000 |
| parents | f476e2497568 990b4ddaf582 |
| children | 890f4b2cc444 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 16 Dec 2015 16:47:34 +0000 |
| parents | f476e2497568 990b4ddaf582 |
| children | 890f4b2cc444 |