diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-12-03 16:13:33 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-12-03 16:13:33 +0000 |
commit | 83032c99421f143eb305df8bb1df6dfebe36abf9 (patch) | |
tree | f1c797f19cad4a3ec583963a4ef16fead9aa08d6 /plugins/muc/occupant.lib.lua | |
parent | 0bd91699304e6e338d4bc934f331349d70debaac (diff) | |
parent | 6d8484bb7ba2a1320b190b1dfc0a0496167815ae (diff) | |
download | prosody-83032c99421f143eb305df8bb1df6dfebe36abf9.tar.gz prosody-83032c99421f143eb305df8bb1df6dfebe36abf9.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc/occupant.lib.lua')
0 files changed, 0 insertions, 0 deletions