Mercurial > prosody-hg
diff plugins/muc/occupant.lib.lua @ 8185:e89320b8a789
Merge 0.10 -> trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 28 Jul 2017 23:47:38 +0100 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 28 Jul 2017 23:47:38 +0100 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |