aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-01-22 10:44:24 +0100
committerKim Alvefur <zash@zash.se>2019-01-22 10:44:24 +0100
commit2748b1f5ec7b48eae6bc8ebeb4db84f8e62cd963 (patch)
treeedac628d90878379d6fe710e7ac184a448c7350e /net
parent54bfc5180fd94c731b4f021ed1ea142079fc1511 (diff)
parentf8d61d21e5521c7ef5863fde23500298cc21467d (diff)
downloadprosody-2748b1f5ec7b48eae6bc8ebeb4db84f8e62cd963.tar.gz
prosody-2748b1f5ec7b48eae6bc8ebeb4db84f8e62cd963.zip
Merge 0.11->trunk
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions