Mercurial > prosody-hg
diff core/s2smanager.lua @ 8412:0ea1e95b3a11
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 22 Nov 2017 02:36:10 +0100 |
| parents | f91e7ec9654e |
| children | 4f0f5b49bb03 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 22 Nov 2017 02:36:10 +0100 |
| parents | f91e7ec9654e |
| children | 4f0f5b49bb03 |