Mercurial > prosody-hg
diff core/s2smanager.lua @ 8015:ecb110f45c92
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 28 Mar 2017 20:14:35 +0200 |
| parents | f91e7ec9654e |
| children | 4f0f5b49bb03 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 28 Mar 2017 20:14:35 +0200 |
| parents | f91e7ec9654e |
| children | 4f0f5b49bb03 |