diff options
author | Kim Alvefur <zash@zash.se> | 2018-03-06 01:45:58 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-03-06 01:45:58 +0100 |
commit | d03099c7ccb22d9f6fc153fdc528bd8931be4c31 (patch) | |
tree | b9780166d9f854ccf1a7d840f8f6b01f4e6628c1 /plugins/mod_mam/mamprefsxml.lib.lua | |
parent | 980816bca6d2f3deafb5db0669453c538415b358 (diff) | |
parent | f7bf94cd0379a9d11e59d6fcb90348d10635377e (diff) | |
download | prosody-d03099c7ccb22d9f6fc153fdc528bd8931be4c31.tar.gz prosody-d03099c7ccb22d9f6fc153fdc528bd8931be4c31.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam/mamprefsxml.lib.lua')
0 files changed, 0 insertions, 0 deletions