Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 7516:f74ff35a4b03
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 23 Jul 2016 18:58:58 +0200 |
| parents | 4c8ee8175f5e |
| children | 3f8520b59677 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 23 Jul 2016 18:58:58 +0200 |
| parents | 4c8ee8175f5e |
| children | 3f8520b59677 |