diff options
author | Kim Alvefur <zash@zash.se> | 2014-10-05 15:37:46 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-10-05 15:37:46 +0200 |
commit | 505ba5222550485aab2d062dc2bf6f7a5bc9b0b0 (patch) | |
tree | c419f2d0ba15e1d5364c44a1e2b6f89e99f16f85 /plugins/muc | |
parent | f5f64c67636ac8bfc9e1add666229278c689bf0a (diff) | |
parent | 3ae8a2ed6ef23c1e7cea54a93b05c624a321cf08 (diff) | |
download | prosody-505ba5222550485aab2d062dc2bf6f7a5bc9b0b0.tar.gz prosody-505ba5222550485aab2d062dc2bf6f7a5bc9b0b0.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc')
0 files changed, 0 insertions, 0 deletions