Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 7496:98c8d14be4ef
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Jul 2016 18:43:28 +0200 |
| parents | 4a178edc9847 |
| children | 45d28235ebe0 65ba769d9f05 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Jul 2016 18:43:28 +0200 |
| parents | 4a178edc9847 |
| children | 45d28235ebe0 65ba769d9f05 |