Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 6048:e447601cf13c
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 01 Apr 2014 15:02:36 +0100 |
| parents | 2d652afa57e4 |
| children | 0f6399c86c10 bea3862b6bde |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 01 Apr 2014 15:02:36 +0100 |
| parents | 2d652afa57e4 |
| children | 0f6399c86c10 bea3862b6bde |