Mercurial > prosody-hg
diff plugins/muc/history.lib.lua @ 6603:e702ae7aa3d9
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 26 Mar 2015 16:49:03 +0000 |
| parents | 0f940a7ba489 |
| children | 84e01dbb739e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 26 Mar 2015 16:49:03 +0000 |
| parents | 0f940a7ba489 |
| children | 84e01dbb739e |