diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-25 18:03:44 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-25 18:03:44 +0200 |
commit | 82e11141e9c48be266f0de78192fdc050e9ed28d (patch) | |
tree | 1e32c314fb85cbf368bdbedfe0f8eb757cc79d45 /plugins/muc/lock.lib.lua | |
parent | 8a539ac1ee9de45326aabefaa124bc7792134521 (diff) | |
parent | 777da29e5904b91277b087f2ee207545671edf03 (diff) | |
download | prosody-82e11141e9c48be266f0de78192fdc050e9ed28d.tar.gz prosody-82e11141e9c48be266f0de78192fdc050e9ed28d.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc/lock.lib.lua')
0 files changed, 0 insertions, 0 deletions