aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-10-23 18:33:10 +0100
committerMatthew Wild <mwild1@gmail.com>2008-10-23 18:33:10 +0100
commitf16fb585d29eb40325e0f5e9ecf3a2a782566b5e (patch)
tree315ce5f5233a1a3a4631cea51477e8914b162d29 /net
parent0fb99ab508f05c662336c8e7300d8b0da22b6168 (diff)
downloadprosody-f16fb585d29eb40325e0f5e9ecf3a2a782566b5e.tar.gz
prosody-f16fb585d29eb40325e0f5e9ecf3a2a782566b5e.zip
Reverting stanza_router to non-conflicted version
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions