Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 7496:98c8d14be4ef
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Jul 2016 18:43:28 +0200 |
| parents | f0a2a305b788 |
| children | cde4ef90cf3d 3dff38ffdcd0 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Jul 2016 18:43:28 +0200 |
| parents | f0a2a305b788 |
| children | cde4ef90cf3d 3dff38ffdcd0 |