Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 7747:0e442402cebc
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 27 Nov 2016 01:06:23 +0100 |
| parents | bffbea1187ca 3dff38ffdcd0 |
| children | f237d0155e59 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 27 Nov 2016 01:06:23 +0100 |
| parents | bffbea1187ca 3dff38ffdcd0 |
| children | f237d0155e59 |