Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 6962:2bb6586eacdd
Merge...
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 03 Dec 2015 16:46:24 +0100 |
| parents | 3c4799467dae |
| children | 329d5fb8a9d3 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 03 Dec 2015 16:46:24 +0100 |
| parents | 3c4799467dae |
| children | 329d5fb8a9d3 |