diff options
author | Kim Alvefur <zash@zash.se> | 2019-01-17 01:09:38 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-01-17 01:09:38 +0100 |
commit | 06e29c834c2713c13000e3cf11f08ba7df239178 (patch) | |
tree | 49240ef320cc0bdd0d6a974125e16e7a99ccdbb0 /plugins/mod_mam/mamprefsxml.lib.lua | |
parent | 5268b2c180c1bce00117232541a979a909ff2eb3 (diff) | |
parent | 30ab1bca8673be0e2e8370bf70990e88dc4b9fea (diff) | |
download | prosody-06e29c834c2713c13000e3cf11f08ba7df239178.tar.gz prosody-06e29c834c2713c13000e3cf11f08ba7df239178.zip |
Merge 0.11->trunk
Diffstat (limited to 'plugins/mod_mam/mamprefsxml.lib.lua')
0 files changed, 0 insertions, 0 deletions