diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-28 20:05:56 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-28 20:05:56 +0100 |
| commit | 489122032eb363a6de4aa173e213741ccf1a95ef (patch) | |
| tree | 8212a106f78e4d988ee48d938496162cf17d890a /net/server.lua | |
| parent | 064e24d77ab8bf32377c6eee731dc6a86818de60 (diff) | |
| parent | a045849dfac5e50ef8c88c1d89b044e586d6c8e6 (diff) | |
| download | prosody-489122032eb363a6de4aa173e213741ccf1a95ef.tar.gz prosody-489122032eb363a6de4aa173e213741ccf1a95ef.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions