Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 6835:3afb8aa78069
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 17 Sep 2015 22:15:26 +0200 |
| parents | 9019bc4c9a5a 428b8da1cfce |
| children | 494938dec5d8 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 17 Sep 2015 22:15:26 +0200 |
| parents | 9019bc4c9a5a 428b8da1cfce |
| children | 494938dec5d8 |