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 | fb36acd6eeb0316a068acc3ac4dd3584869500b9 (patch) | |
tree | 0c04cc8be235f6105a1fd70380b87f3d7bb8b8b4 /plugins/mod_mam/mod_mam.lua | |
parent | c5edea490f3205da545ac477b4715d35ebd36e70 (diff) | |
parent | 46b3b5d02cb5c33782b9974ac71c7065031155de (diff) | |
download | prosody-fb36acd6eeb0316a068acc3ac4dd3584869500b9.tar.gz prosody-fb36acd6eeb0316a068acc3ac4dd3584869500b9.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_mam/mod_mam.lua')
0 files changed, 0 insertions, 0 deletions