Mercurial > prosody-modules
diff mod_mam/mamprefsxml.lib.lua @ 1956:1a5be0ecc876
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 25 Nov 2015 14:40:43 +0100 |
| parents | 18349533c44d |
| children | dfa9c0cdd960 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 25 Nov 2015 14:40:43 +0100 |
| parents | 18349533c44d |
| children | dfa9c0cdd960 |