Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 7738:0647b821e00a
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 24 Nov 2016 14:18:25 +0100 |
| parents | 589e27b47d56 |
| children | 8d6f367bed8c a8cc495a65dc |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 24 Nov 2016 14:18:25 +0100 |
| parents | 589e27b47d56 |
| children | 8d6f367bed8c a8cc495a65dc |