diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-01-04 09:14:57 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-01-04 09:14:57 +0000 |
commit | 8502b7dc5d7169a43be5dd6fca14417ed39187a4 (patch) | |
tree | ab26708d42996a414b963a224970995aed5179cc /plugins/muc | |
parent | a49b476d83f97960c80fa860b68073bebf5c5d93 (diff) | |
parent | 768cef78e233f2f613799dba6b525bdf8f7ca75c (diff) | |
download | prosody-8502b7dc5d7169a43be5dd6fca14417ed39187a4.tar.gz prosody-8502b7dc5d7169a43be5dd6fca14417ed39187a4.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc')
0 files changed, 0 insertions, 0 deletions