diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-25 18:11:45 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-25 18:11:45 +0200 |
commit | e8cb3e473a07e28039c0b41ab1ee83db524364f5 (patch) | |
tree | a6337188aad637f9b090520d9007ca3b146fe69d /plugins/muc/occupant.lib.lua | |
parent | 5fb304d7a14207bd63294d4032eb4d304139d7a9 (diff) | |
parent | ea219ecbdcd08607b7e54b56ffaa3ac10aa9801a (diff) | |
download | prosody-e8cb3e473a07e28039c0b41ab1ee83db524364f5.tar.gz prosody-e8cb3e473a07e28039c0b41ab1ee83db524364f5.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc/occupant.lib.lua')
0 files changed, 0 insertions, 0 deletions