Mercurial > prosody-hg
diff core/s2smanager.lua @ 8707:fd39c44c0113
Merge 0.10 -> trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 04 Apr 2018 18:42:05 +0100 |
| parents | d3d74e923e4e |
| children | 6625efab91e2 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 04 Apr 2018 18:42:05 +0100 |
| parents | d3d74e923e4e |
| children | 6625efab91e2 |