diff options
author | Kim Alvefur <zash@zash.se> | 2017-04-12 20:59:18 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-04-12 20:59:18 +0200 |
commit | a22c6725be05e65b0ccde5b8e2b8eb22944a3426 (patch) | |
tree | 812565071e2a3b84ab2fee8ca331e5be4b6e63e7 /plugins/muc | |
parent | 8a9dd05b08a3a85b84680547e9b0f2027499fd37 (diff) | |
parent | b3cd19063f63fa426f35523bfb77be45d1e0dd4e (diff) | |
download | prosody-a22c6725be05e65b0ccde5b8e2b8eb22944a3426.tar.gz prosody-a22c6725be05e65b0ccde5b8e2b8eb22944a3426.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc')
0 files changed, 0 insertions, 0 deletions