Mercurial > prosody-modules
diff mod_muc_intercom/mod_muc_intercom.lua @ 2743:1fa9620220e3
merge commit
| author | tmolitor <thilo@eightysoft.de> |
|---|---|
| date | Thu, 17 Aug 2017 21:34:56 +0200 |
| parents | 9c894b56b4e4 |
| children | 6d3935226ffb |
| author | tmolitor <thilo@eightysoft.de> |
|---|---|
| date | Thu, 17 Aug 2017 21:34:56 +0200 |
| parents | 9c894b56b4e4 |
| children | 6d3935226ffb |