diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-25 01:42:59 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-25 01:42:59 +0200 |
commit | 30a4f36e03d8fad67839ee27ee037967ab50b385 (patch) | |
tree | 76b402f43306dd2f1a20dd5b16f9fe1bf9c15a42 /plugins/mod_mam | |
parent | d53fffb30e060a0b2059d32707ac7b45966375f0 (diff) | |
parent | 42cd234969a1c68f54c6a804649ef9746e95f148 (diff) | |
download | prosody-30a4f36e03d8fad67839ee27ee037967ab50b385.tar.gz prosody-30a4f36e03d8fad67839ee27ee037967ab50b385.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam')
0 files changed, 0 insertions, 0 deletions