Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 10441:f2c9abc71f08
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 24 Nov 2019 04:46:36 +0100 |
| parents | dd4eb84d92a8 |
| children | 698ff3610e57 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 24 Nov 2019 04:46:36 +0100 |
| parents | dd4eb84d92a8 |
| children | 698ff3610e57 |