Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 8294:90576b60f2d0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 05 Oct 2017 18:06:04 +0200 |
| parents | e21d82551e05 |
| children | 0f05d6535dfa |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 05 Oct 2017 18:06:04 +0200 |
| parents | e21d82551e05 |
| children | 0f05d6535dfa |