Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 7098:5286e79c6829
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 22 Jan 2016 14:49:05 +0100 |
| parents | 990b4ddaf582 |
| children | f387fae9fb31 dacc07833b86 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 22 Jan 2016 14:49:05 +0100 |
| parents | 990b4ddaf582 |
| children | f387fae9fb31 dacc07833b86 |