diff options
| author | Kim Alvefur <zash@zash.se> | 2016-05-25 21:35:09 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-05-25 21:35:09 +0200 |
| commit | a94034cbe38778a9e9bdf6bc10faf8a1584f4156 (patch) | |
| tree | 3556e1c72692e7f3e51123d92fbdc1d6ed34e820 /net/server.lua | |
| parent | 02a58e54db100bda071a7043bbcfc0022d3a10af (diff) | |
| parent | 01a15bfbe296ed254b1daae646f07640e389d70d (diff) | |
| download | prosody-a94034cbe38778a9e9bdf6bc10faf8a1584f4156.tar.gz prosody-a94034cbe38778a9e9bdf6bc10faf8a1584f4156.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions