Mercurial > prosody-hg
diff plugins/muc/mod_muc.lua @ 6608:b6e558febb7a
Merge with merge merge merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:19:44 +0000 |
| parents | 0f6399c86c10 |
| children | 3a1c39b31497 79318d548465 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 27 Mar 2015 22:19:44 +0000 |
| parents | 0f6399c86c10 |
| children | 3a1c39b31497 79318d548465 |