Mercurial > prosody-hg
diff core/s2smanager.lua @ 6962:2bb6586eacdd
Merge...
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 03 Dec 2015 16:46:24 +0100 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 03 Dec 2015 16:46:24 +0100 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |