diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-06 01:14:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-06 01:14:32 +0100 |
commit | ca65f0d2d3718301b880c0260c991cd8ee7977ae (patch) | |
tree | e58db2bf464bf09301a9c02c27330c2dba6b926d /plugins/mod_mam/mamprefs.lib.lua | |
parent | b133b78d47ff180110b0b29612d3cd257a9972c1 (diff) | |
parent | e45c5961ac42007aa6c9282afddff91cd1e27124 (diff) | |
download | prosody-ca65f0d2d3718301b880c0260c991cd8ee7977ae.tar.gz prosody-ca65f0d2d3718301b880c0260c991cd8ee7977ae.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam/mamprefs.lib.lua')
0 files changed, 0 insertions, 0 deletions