diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-03 15:52:40 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-03 15:52:40 +0200 |
commit | 5e6475392910df01592a526e564634fc19c1c887 (patch) | |
tree | 4638d1171ad6d0127b6c0f99e7267837b51de056 /net/server.lua | |
parent | 5db607f37e4370d12d350c0894804331a0231d5e (diff) | |
parent | 4308f867bbf943eb472034807effd8bddf724fa2 (diff) | |
download | prosody-5e6475392910df01592a526e564634fc19c1c887.tar.gz prosody-5e6475392910df01592a526e564634fc19c1c887.zip |
Merge 0.9->0.10
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions