diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-20 00:41:49 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-20 00:41:49 +0200 |
commit | a7b9c6de423f4f4572aaf81674903a27fbcd7c67 (patch) | |
tree | 6807f13197827f810a9a2cd3dc79efcf2e61e093 /plugins/mod_mam | |
parent | 5d4b489c3c77347b9050fae4d6e01a8649817084 (diff) | |
parent | 256ab5259da1de5e24691493c0f6a26595e17208 (diff) | |
download | prosody-a7b9c6de423f4f4572aaf81674903a27fbcd7c67.tar.gz prosody-a7b9c6de423f4f4572aaf81674903a27fbcd7c67.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam')
0 files changed, 0 insertions, 0 deletions