diff options
author | Kim Alvefur <zash@zash.se> | 2017-08-28 21:05:12 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-08-28 21:05:12 +0200 |
commit | 0f00e8546042a22a56ea63a0fb7387e70bba4d1a (patch) | |
tree | fd5a447ceea625acd90410b509ca06e498d25171 /plugins/muc/mod_muc.lua | |
parent | ab793182e77752bd08cf0347a95298312693563b (diff) | |
parent | 672ab9595bcadcefa5c8725fd0ba4d7d6089b4f5 (diff) | |
download | prosody-0f00e8546042a22a56ea63a0fb7387e70bba4d1a.tar.gz prosody-0f00e8546042a22a56ea63a0fb7387e70bba4d1a.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc/mod_muc.lua')
0 files changed, 0 insertions, 0 deletions