Mercurial > prosody-modules
comparison mod_mam/mamprefs.lib.lua @ 1956:1a5be0ecc876
Merge
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Wed, 25 Nov 2015 14:40:43 +0100 |
parents | 572b1ad46182 |
children | d44ac0756c46 |
comparison
equal
deleted
inserted
replaced
1954:050cd7b6fa96 | 1956:1a5be0ecc876 |
---|