diff options
author | Kim Alvefur <zash@zash.se> | 2018-12-02 02:38:36 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-12-02 02:38:36 +0100 |
commit | a9e9c490274549c48680a8bf699806a1e069845e (patch) | |
tree | 7819234af6cb36c65bec2a37c8f141fd486ebb01 /plugins/mod_mam/mamprefsxml.lib.lua | |
parent | 3836d03c37dbd7f3dcd07eb68dab3ca5f0290329 (diff) | |
parent | 76536dab05ed39a321accdcb7a3808f0c24cc42e (diff) | |
download | prosody-a9e9c490274549c48680a8bf699806a1e069845e.tar.gz prosody-a9e9c490274549c48680a8bf699806a1e069845e.zip |
Merge 0.11->trunk
Diffstat (limited to 'plugins/mod_mam/mamprefsxml.lib.lua')
0 files changed, 0 insertions, 0 deletions