Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 8026:f237d0155e59
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 31 Mar 2017 19:01:42 +0200 |
| parents | 0e442402cebc 8a7c4497569a |
| children | 9f2a5fc9e4a5 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 31 Mar 2017 19:01:42 +0200 |
| parents | 0e442402cebc 8a7c4497569a |
| children | 9f2a5fc9e4a5 |