Mercurial > prosody-hg
diff net/server_event.lua @ 7219:c12c9b9c1949
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Feb 2016 19:27:13 +0100 |
| parents | 20ac6972b9aa |
| children | a74f0b7be6bf |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Feb 2016 19:27:13 +0100 |
| parents | 20ac6972b9aa |
| children | a74f0b7be6bf |