Mercurial > prosody-hg
comparison plugins/muc/occupant.lib.lua @ 8060:71bdfdf6565d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 04 Apr 2017 01:41:09 +0200 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |
comparison
equal
deleted
inserted
replaced
| 8051:b2681397bafa | 8060:71bdfdf6565d |
|---|
