diff options
author | Kim Alvefur <zash@zash.se> | 2017-08-29 15:24:53 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-08-29 15:24:53 +0200 |
commit | 4e7a2d21e80babc720d2ce60477d3792f8b446f0 (patch) | |
tree | 89966fbd0675f77f8082f010affbb182b2295b2d /plugins/mod_mam/mamprefsxml.lib.lua | |
parent | 38f73e28ae61f2222667b06ce99e44193ef82d78 (diff) | |
parent | 0147d39460cc20d670a97a627be5f097ef5372af (diff) | |
download | prosody-4e7a2d21e80babc720d2ce60477d3792f8b446f0.tar.gz prosody-4e7a2d21e80babc720d2ce60477d3792f8b446f0.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam/mamprefsxml.lib.lua')
0 files changed, 0 insertions, 0 deletions