diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-16 22:44:43 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-16 22:44:43 +0100 |
commit | 48f8c23f4ab0e8400e20101960055eb29c4aa6f7 (patch) | |
tree | bde7b68581a288e5d3fc8a036c80502296972394 /net/server.lua | |
parent | 69f9998d1641846399e3d2818da4fd07ae05739a (diff) | |
parent | 83e7c91e0130f27720406b87996c4c74b7cc0afe (diff) | |
download | prosody-48f8c23f4ab0e8400e20101960055eb29c4aa6f7.tar.gz prosody-48f8c23f4ab0e8400e20101960055eb29c4aa6f7.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions