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