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