Mercurial > prosody-hg
comparison core/s2smanager.lua @ 6935:d12917643e65
Merge
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Nov 2015 10:45:48 +0000 |
| parents | 6236668da30a |
| children | d916703d5e18 24170d74b00b |
comparison
equal
deleted
inserted
replaced
| 6934:5d913559d092 | 6935:d12917643e65 |
|---|
