diff options
| author | Kim Alvefur <zash@zash.se> | 2015-05-14 00:24:21 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-05-14 00:24:21 +0200 |
| commit | 217aae0531fa09e57d3b324816da793a72655047 (patch) | |
| tree | 887ef8ce4128251eb52ba5753584e8262a89d492 /net/server.lua | |
| parent | 539f4b561436344e095cc945afe6301edf272250 (diff) | |
| parent | 9f6130ddaa3ebb231f617261c0f325a8d4bc29d7 (diff) | |
| download | prosody-217aae0531fa09e57d3b324816da793a72655047.tar.gz prosody-217aae0531fa09e57d3b324816da793a72655047.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/server.lua')
0 files changed, 0 insertions, 0 deletions