Mercurial > prosody-modules
diff mod_muc_intercom/mod_muc_intercom.lua @ 1452:097c6af98d0a
Merge
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 25 Jun 2014 20:46:35 +0200 |
parents | 9c894b56b4e4 |
children | 6d3935226ffb |
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 25 Jun 2014 20:46:35 +0200 |
parents | 9c894b56b4e4 |
children | 6d3935226ffb |