diff options
author | Matthew Wild <mwild1@gmail.com> | 2017-09-26 17:24:25 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2017-09-26 17:24:25 +0100 |
commit | 10c321a29dae7e721ba168f5a05beca22e14e7f4 (patch) | |
tree | 575fdc7082baf42f3c7871cac1bc03d7fa65f905 /plugins/mod_mam/mamprefsxml.lib.lua | |
parent | 672f22b6f9036895ba3301bbee91abbe99b180be (diff) | |
parent | 63252575dfc7c74434c642beafd29e34e3c89c62 (diff) | |
download | prosody-10c321a29dae7e721ba168f5a05beca22e14e7f4.tar.gz prosody-10c321a29dae7e721ba168f5a05beca22e14e7f4.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam/mamprefsxml.lib.lua')
0 files changed, 0 insertions, 0 deletions