diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-28 19:27:13 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-28 19:27:13 +0100 |
| commit | 064e24d77ab8bf32377c6eee731dc6a86818de60 (patch) | |
| tree | 7f984e40e2046c1e5531857f92b671bd4dea3bb2 /net/server.lua | |
| parent | 9c95a61161f878e4a6487c13ea33854a58bad4a0 (diff) | |
| parent | 30411b481d0457fdbf434898fbce94e51b0d071c (diff) | |
| download | prosody-064e24d77ab8bf32377c6eee731dc6a86818de60.tar.gz prosody-064e24d77ab8bf32377c6eee731dc6a86818de60.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions