Mercurial > prosody-hg
diff plugins/muc/occupant.lib.lua @ 7462:ced4e800f42a
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 28 Jun 2016 14:54:43 +0100 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 28 Jun 2016 14:54:43 +0100 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |