diff options
author | Kim Alvefur <zash@zash.se> | 2021-01-12 19:19:15 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2021-01-12 19:19:15 +0100 |
commit | f4208459a70ad45794af44c54a7de2e2785ef9e9 (patch) | |
tree | 997cb2d8bce39f14c53cffc37d43c8a3715f81c5 /plugins/mod_mam/mamprefsxml.lib.lua | |
parent | 2f4d12286f17da4e0a1d6916e9c6addd5f61f9f5 (diff) | |
parent | f36531b53a33601d2ccf9b3481f20c26efc0198b (diff) | |
download | prosody-f4208459a70ad45794af44c54a7de2e2785ef9e9.tar.gz prosody-f4208459a70ad45794af44c54a7de2e2785ef9e9.zip |
Merge 0.11->trunk
Diffstat (limited to 'plugins/mod_mam/mamprefsxml.lib.lua')
0 files changed, 0 insertions, 0 deletions