diff options
author | Kim Alvefur <zash@zash.se> | 2014-06-21 15:05:21 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-06-21 15:05:21 +0200 |
commit | 265b49cc49438767327fc3468561a4fbcf484fe0 (patch) | |
tree | 4b91a8b3eb46356ffbeb1e5b957c23ca30c77722 /net/server.lua | |
parent | 2ba9c6ce77c348bb773258c1dbd5883d7d5f5989 (diff) | |
parent | 42475293d1b990ce37d872508e1da8accf961cba (diff) | |
download | prosody-265b49cc49438767327fc3468561a4fbcf484fe0.tar.gz prosody-265b49cc49438767327fc3468561a4fbcf484fe0.zip |
Merge 0.9->0.10
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions