aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-07-29 12:34:16 +0200
committerKim Alvefur <zash@zash.se>2016-07-29 12:34:16 +0200
commit83b016fe3d1298c6bd9994cd6e61833522459b26 (patch)
tree54310cc96bc9904a03ed6cfea934245f4d347058 /net/server.lua
parentd6780dd7edf90f052074613505fd5917e76b72e6 (diff)
parent0e989e1401461849ad45949f61a6e9413dd2f160 (diff)
downloadprosody-83b016fe3d1298c6bd9994cd6e61833522459b26.tar.gz
prosody-83b016fe3d1298c6bd9994cd6e61833522459b26.zip
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions