Mercurial > prosody-hg
comparison plugins/muc/occupant.lib.lua @ 6843:161cccfdf015
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 22 Sep 2015 01:31:52 +0200 |
| parents | 006b0e0f0de2 |
| children | 6cc7c9da29ed |
comparison
equal
deleted
inserted
replaced
| 6839:298182fd2387 | 6843:161cccfdf015 |
|---|
