Mercurial > prosody-modules
diff mod_mam/mamprefs.lib.lua @ 1524:604a8cee9d58
Merge
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 13 Oct 2014 14:31:16 +0200 |
parents | 572b1ad46182 |
children | d44ac0756c46 |
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 13 Oct 2014 14:31:16 +0200 |
parents | 572b1ad46182 |
children | d44ac0756c46 |