Mercurial > prosody-hg
diff plugins/muc/description.lib.lua @ 6775:22c8deb43daf
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 11 Aug 2015 10:29:25 +0200 |
| parents | c3254827698d |
| children | 84e01dbb739e |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 11 Aug 2015 10:29:25 +0200 |
| parents | c3254827698d |
| children | 84e01dbb739e |