diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-01 22:38:02 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-01 22:38:02 +0200 |
| commit | c27589b44c5312d9119d0152ed4dcf1b5492414c (patch) | |
| tree | 54caf551ee6f37067537da4cfe6cdd84050f92a0 /net/server.lua | |
| parent | 2364604bc18ed52d599160a169a465d85a20a0c6 (diff) | |
| parent | 3e4952567c828aa7a475fa9bcc48f794d92fdf2c (diff) | |
| download | prosody-c27589b44c5312d9119d0152ed4dcf1b5492414c.tar.gz prosody-c27589b44c5312d9119d0152ed4dcf1b5492414c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions