Mercurial > prosody-hg
comparison plugins/muc/mod_muc.lua @ 6285:ea60d0441df7
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 21 Jun 2014 15:05:52 +0200 |
| parents | 9290a2906feb |
| children | 93fb28851d9e |
comparison
equal
deleted
inserted
replaced
| 6278:fcc3ef191293 | 6285:ea60d0441df7 |
|---|
