Mercurial > prosody-hg
comparison plugins/muc/occupant.lib.lua @ 6354:bbb4a82db32e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Aug 2014 19:22:08 +0200 |
| parents | 006b0e0f0de2 |
| children | 6cc7c9da29ed |
comparison
equal
deleted
inserted
replaced
| 6349:0cee68dd35f8 | 6354:bbb4a82db32e |
|---|
