Mercurial > prosody-hg
diff core/s2smanager.lua @ 7723:488fddf88ffd
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 19 Nov 2016 01:05:36 +0100 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 19 Nov 2016 01:05:36 +0100 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |