aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-08-06 14:35:03 +0200
committerKim Alvefur <zash@zash.se>2013-08-06 14:35:03 +0200
commit132f38d70aa6187f55474b583702e57260eee311 (patch)
tree43e921f6bd3937398e258a64aa064ae01360625e /net/server.lua
parent6b7b6e0e7b6afa7964e22a4af1bf117f17dbff9c (diff)
parenta316833b30b2e58f75ca808f0006c877b52f7d01 (diff)
downloadprosody-132f38d70aa6187f55474b583702e57260eee311.tar.gz
prosody-132f38d70aa6187f55474b583702e57260eee311.zip
Merge 0.9->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions