Mercurial > prosody-hg
diff net/server_event.lua @ 8060:71bdfdf6565d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 04 Apr 2017 01:41:09 +0200 |
| parents | cdb5dd9f35c0 |
| children | 1d2149d84c72 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 04 Apr 2017 01:41:09 +0200 |
| parents | cdb5dd9f35c0 |
| children | 1d2149d84c72 |