Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 9586:44dbee2f173f
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Oct 2018 17:17:07 +0100 |
| parents | 94033a2529b9 |
| children | 7fa273f8869e bacca65ce107 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Oct 2018 17:17:07 +0100 |
| parents | 94033a2529b9 |
| children | 7fa273f8869e bacca65ce107 |