Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 7717:9c8eb0239eef
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 05 Nov 2016 00:28:30 +0100 |
| parents | 8d6f367bed8c |
| children | 11fcdef5022f |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 05 Nov 2016 00:28:30 +0100 |
| parents | 8d6f367bed8c |
| children | 11fcdef5022f |