diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-11-22 21:02:27 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-11-22 21:02:27 +0000 |
commit | a6572c9a86d73b2f25a37440f677e90881f1a808 (patch) | |
tree | f70daf210feb67558ef27e20195d002fa3aef5d1 /core/stanza_router.lua | |
parent | f4fc1d595130a21101a6d3b27ee1976f390dbc46 (diff) | |
parent | d48e08b81a83f03c6100b6aab300011bb0949701 (diff) | |
download | prosody-a6572c9a86d73b2f25a37440f677e90881f1a808.tar.gz prosody-a6572c9a86d73b2f25a37440f677e90881f1a808.zip |
Merge with a merge (or something)
Diffstat (limited to 'core/stanza_router.lua')
0 files changed, 0 insertions, 0 deletions