Mercurial > prosody-hg
diff core/s2smanager.lua @ 7780:dbd202e7c587
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 10 Dec 2016 02:55:38 +0100 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 10 Dec 2016 02:55:38 +0100 |
| parents | d916703d5e18 |
| children | f91e7ec9654e |