Mercurial > prosody-hg
comparison plugins/muc/occupant.lib.lua @ 7505:3d950ee0de35
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 14 Jul 2016 13:41:02 +0200 |
| parents | 6cc7c9da29ed |
| children | 74b9e05af71e |
comparison
equal
deleted
inserted
replaced
| 7497:22942eda53f8 | 7505:3d950ee0de35 |
|---|
