Mercurial > prosody-hg
comparison plugins/muc/occupant.lib.lua @ 7780:dbd202e7c587
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 10 Dec 2016 02:55:38 +0100 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |
comparison
equal
deleted
inserted
replaced
| 7768:57d0f2d3d5c5 | 7780:dbd202e7c587 |
|---|
