diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-24 19:27:17 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-24 19:27:17 +0100 |
commit | 45334397e8ae6def260f86a681a509275c67c395 (patch) | |
tree | 2421f921894940e72b7ce82614ed89c20fd9edf3 /plugins/mod_mam | |
parent | db88e0f7b51eeaed68b9b50502b6ba82c53633a1 (diff) | |
parent | a4370a9db89edafd2bbe54e59644f36db49ce07d (diff) | |
download | prosody-45334397e8ae6def260f86a681a509275c67c395.tar.gz prosody-45334397e8ae6def260f86a681a509275c67c395.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam')
0 files changed, 0 insertions, 0 deletions