diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-06 15:31:21 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-06 15:31:21 +0100 |
commit | 12b74e9dde7fbabe26e3bcca7d0249621344476a (patch) | |
tree | 12c170f5c451cd6de06f1b842d220909e39f46e9 /plugins/mod_mam/mamprefsxml.lib.lua | |
parent | 0e71fac1d18b0de0e9203cb6b71c971d55c8c70c (diff) | |
parent | a889b0287767bd9e7ab5f213607f453acac448f9 (diff) | |
download | prosody-12b74e9dde7fbabe26e3bcca7d0249621344476a.tar.gz prosody-12b74e9dde7fbabe26e3bcca7d0249621344476a.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam/mamprefsxml.lib.lua')
0 files changed, 0 insertions, 0 deletions