diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-24 00:28:18 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-24 00:28:18 +0100 |
commit | e6142a0d4b1e5b72236e357287a8e74f57695ef0 (patch) | |
tree | b29f3839bd4152e61572e19ae12ecdbd56b1f538 /plugins/mod_mam/mamprefsxml.lib.lua | |
parent | ee51a6cf84d7f07a9b0780c02ad2d56e523df0eb (diff) | |
parent | 12e5d691c25fddbcb8ff2e24583cc2a3ffa651e1 (diff) | |
download | prosody-e6142a0d4b1e5b72236e357287a8e74f57695ef0.tar.gz prosody-e6142a0d4b1e5b72236e357287a8e74f57695ef0.zip |
Merge 0.9->0.10
Diffstat (limited to 'plugins/mod_mam/mamprefsxml.lib.lua')
0 files changed, 0 insertions, 0 deletions