aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-21 14:52:43 +0100
committerKim Alvefur <zash@zash.se>2016-03-21 14:52:43 +0100
commit1193a4bdb914eba2a902ae5275bd56438bd49b55 (patch)
tree85a3c7b4d4efadd9c68b69eac3178dca98372e19 /net/server.lua
parent0a88a8699681f8ebf26b2f86531328c583c97f7b (diff)
parent6a65e76fc615bd10c21776bd4c4455ab522d2f29 (diff)
downloadprosody-1193a4bdb914eba2a902ae5275bd56438bd49b55.tar.gz
prosody-1193a4bdb914eba2a902ae5275bd56438bd49b55.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions