Mercurial > prosody-hg
comparison core/s2smanager.lua @ 7031:89221daefae9
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 23 Dec 2015 12:11:07 +0100 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |
comparison
equal
deleted
inserted
replaced
| 7028:7d0ce5e6a6d3 | 7031:89221daefae9 |
|---|
