diff options
author | Kim Alvefur <zash@zash.se> | 2015-12-06 02:43:01 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-12-06 02:43:01 +0100 |
commit | bb0ad8d2a9da64ab00fa01b047031e8256554e89 (patch) | |
tree | b85775cefb4f2e0b5029a51f806cbac03d606c7e /plugins/muc/lock.lib.lua | |
parent | 46aa864c3d43b687205c5890db2d6db9691ba78a (diff) | |
parent | 730986f23cc5ce84a0a16c664165653f0aabbf94 (diff) | |
download | prosody-bb0ad8d2a9da64ab00fa01b047031e8256554e89.tar.gz prosody-bb0ad8d2a9da64ab00fa01b047031e8256554e89.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc/lock.lib.lua')
0 files changed, 0 insertions, 0 deletions