Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 8828:2a0d7fa4c56a
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 25 May 2018 03:33:13 +0200 |
| parents | 6d47b74926dd |
| children | 739deb514140 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 25 May 2018 03:33:13 +0200 |
| parents | 6d47b74926dd |
| children | 739deb514140 |