aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-08-29 15:24:53 +0200
committerKim Alvefur <zash@zash.se>2017-08-29 15:24:53 +0200
commit83e34ec9f7610238ae92dcbd5354ecfae0d48bbe (patch)
tree89966fbd0675f77f8082f010affbb182b2295b2d /net
parent0f00e8546042a22a56ea63a0fb7387e70bba4d1a (diff)
parentfb7792a6d38c9bd82fa84f03972862e45b9a160a (diff)
downloadprosody-83e34ec9f7610238ae92dcbd5354ecfae0d48bbe.tar.gz
prosody-83e34ec9f7610238ae92dcbd5354ecfae0d48bbe.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions