diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-24 00:32:09 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-24 00:32:09 +0100 |
| commit | 816b44f0642d5ba90355b6683a03e64e13396ef6 (patch) | |
| tree | 74698345ef518ef640b15ba5c705a0cb0302d66f /net/server.lua | |
| parent | fcaed765157cd655ef028f74994bf4033912de2c (diff) | |
| parent | f2b2195de45826747826751df89ed4aee9577988 (diff) | |
| download | prosody-816b44f0642d5ba90355b6683a03e64e13396ef6.tar.gz prosody-816b44f0642d5ba90355b6683a03e64e13396ef6.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions