Mercurial > prosody-hg
diff plugins/muc/occupant.lib.lua @ 7242:d0296db76ccd
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Mar 2016 23:44:21 +0000 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 05 Mar 2016 23:44:21 +0000 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |