Mercurial > prosody-hg
diff plugins/muc/description.lib.lua @ 6722:d022cb4486bd
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 19 May 2015 09:31:12 +0100 |
| parents | c3254827698d |
| children | 84e01dbb739e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 19 May 2015 09:31:12 +0100 |
| parents | c3254827698d |
| children | 84e01dbb739e |