Mercurial > prosody-hg
diff plugins/muc/occupant.lib.lua @ 6935:d12917643e65
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Nov 2015 10:45:48 +0000 |
| parents | 006b0e0f0de2 |
| children | 6cc7c9da29ed |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Nov 2015 10:45:48 +0000 |
| parents | 006b0e0f0de2 |
| children | 6cc7c9da29ed |