Mercurial > prosody-modules
diff mod_muc_intercom/mod_muc_intercom.lua @ 2702:caabb980d1d8
Merge commit
| author | tmolitor <thilo@eightysoft.de> |
|---|---|
| date | Mon, 24 Apr 2017 20:57:23 +0200 |
| parents | 9c894b56b4e4 |
| children | 6d3935226ffb |
| author | tmolitor <thilo@eightysoft.de> |
|---|---|
| date | Mon, 24 Apr 2017 20:57:23 +0200 |
| parents | 9c894b56b4e4 |
| children | 6d3935226ffb |