Mercurial > prosody-hg
diff core/s2smanager.lua @ 7735:1502ec4f3cbe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 21 Nov 2016 02:40:47 +0100 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 21 Nov 2016 02:40:47 +0100 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |