Mercurial > prosody-hg
comparison core/s2smanager.lua @ 9136:07fc2c5c0c2e
Merge jonasw->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 06 Aug 2018 16:58:21 +0200 |
| parents | d3d74e923e4e |
| children | 6625efab91e2 |
comparison
equal
deleted
inserted
replaced
| 9134:4aa786a180f5 | 9136:07fc2c5c0c2e |
|---|
