diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-05-16 23:50:08 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-05-16 23:50:08 +0100 |
| commit | fb374134fdaca725bf31299e879c79877b597105 (patch) | |
| tree | 8cba4635246c19cb8ca893a69d456539ab99a920 /core | |
| parent | 8b1ed4faaefdcf2268a2f10849fca891cf79716f (diff) | |
| parent | 9ddd7d489e083c6cec5741bb9fdd359bed29b052 (diff) | |
| download | prosody-fb374134fdaca725bf31299e879c79877b597105.tar.gz prosody-fb374134fdaca725bf31299e879c79877b597105.zip | |
Merge 0.10 -> trunk
This commit intentionally drops changes from c2b99fa134b3
and 8da11142fabf which are based on older MUC code.
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions