Mercurial > prosody-modules
diff mod_mam/mamprefs.lib.lua @ 1322:bf6796061037
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 20:17:13 +0100 |
| parents | 572b1ad46182 |
| children | d44ac0756c46 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Feb 2014 20:17:13 +0100 |
| parents | 572b1ad46182 |
| children | d44ac0756c46 |