diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-12 12:52:55 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-12 12:52:55 +0100 |
commit | 33f73b5b885da18cef1b983cd1a1fe6d287e0391 (patch) | |
tree | 63cd574c6106032332b41c5a2e4b08f81bffd916 /plugins/mod_mam | |
parent | 70fca613d51b5c6f33759686d59dba1dc8acc0cd (diff) | |
parent | 1ea889fd172e633c5de06ee0e2c05ac1afd608c9 (diff) | |
download | prosody-33f73b5b885da18cef1b983cd1a1fe6d287e0391.tar.gz prosody-33f73b5b885da18cef1b983cd1a1fe6d287e0391.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam')
0 files changed, 0 insertions, 0 deletions