diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-04 01:41:09 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-04 01:41:09 +0200 |
commit | 5354e5645ec328120cadd24a7dfa7139fd07ec60 (patch) | |
tree | 0c04cc8be235f6105a1fd70380b87f3d7bb8b8b4 /plugins/mod_mam/mod_mam.lua | |
parent | 8962d239ed6f606d2808c4fddae80553bc391107 (diff) | |
parent | f94c56040c088f63efdcab886d8ffc311d2e4359 (diff) | |
download | prosody-5354e5645ec328120cadd24a7dfa7139fd07ec60.tar.gz prosody-5354e5645ec328120cadd24a7dfa7139fd07ec60.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam/mod_mam.lua')
0 files changed, 0 insertions, 0 deletions