Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 7120:a6afe52159f1
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 03 Feb 2016 02:13:03 +0100 |
| parents | 50b9a7e86de9 dacc07833b86 |
| children | df22e314946c |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 03 Feb 2016 02:13:03 +0100 |
| parents | 50b9a7e86de9 dacc07833b86 |
| children | df22e314946c |