diff options
| author | Kim Alvefur <zash@zash.se> | 2017-02-20 01:46:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-02-20 01:46:54 +0100 |
| commit | 50992abb107c557eea8ec203d17d085bfc3bc68c (patch) | |
| tree | be7c0181ec8542e0a1056c284cc24ca66e36b9e4 /net/server.lua | |
| parent | f21bbbab6037681ce1496c47213661ad6465a775 (diff) | |
| parent | ef1b01c822a6835cd3567885ceba78c7f42d83f7 (diff) | |
| download | prosody-50992abb107c557eea8ec203d17d085bfc3bc68c.tar.gz prosody-50992abb107c557eea8ec203d17d085bfc3bc68c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions