diff options
author | Kim Alvefur <zash@zash.se> | 2018-03-06 01:45:58 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-03-06 01:45:58 +0100 |
commit | 3a3a5f55eb92b38f9fa4470d74090cabfa44df27 (patch) | |
tree | b9780166d9f854ccf1a7d840f8f6b01f4e6628c1 /plugins/mod_mam | |
parent | 181caccc86df9d4a87b0a76a7d599dbdadc16483 (diff) | |
parent | bde433b14c7b4880a4325ba27ef1e2dfafada426 (diff) | |
download | prosody-3a3a5f55eb92b38f9fa4470d74090cabfa44df27.tar.gz prosody-3a3a5f55eb92b38f9fa4470d74090cabfa44df27.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam')
0 files changed, 0 insertions, 0 deletions