diff options
| author | Kim Alvefur <zash@zash.se> | 2013-11-28 16:17:51 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-11-28 16:17:51 +0100 |
| commit | 9bc05c02b8d97841dead99e1669c736272879a64 (patch) | |
| tree | 626dd6df98cae5d119fea0852d5fce67b6f73b89 /net/server.lua | |
| parent | 6c41d496a264e33b469c73f92253d0e158a496eb (diff) | |
| parent | b8ab703419322fbc54dc75fe4e3cc33f5a41d4bc (diff) | |
| download | prosody-9bc05c02b8d97841dead99e1669c736272879a64.tar.gz prosody-9bc05c02b8d97841dead99e1669c736272879a64.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions