Mercurial > prosody-hg
diff plugins/muc/occupant.lib.lua @ 7885:236b5a6154b2
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 04 Feb 2017 01:08:27 +0100 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 04 Feb 2017 01:08:27 +0100 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |