Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 9654:ede4e15a0fed
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 27 Nov 2018 21:23:31 +0100 |
| parents | 94033a2529b9 |
| children | 7fa273f8869e bacca65ce107 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 27 Nov 2018 21:23:31 +0100 |
| parents | 94033a2529b9 |
| children | 7fa273f8869e bacca65ce107 |