Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 7102:250016f5eb7e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 26 Jan 2016 14:15:38 +0100 |
| parents | 0e81e3dab896 f83211f4d776 |
| children | 1891854b25ac |
line wrap: on
line diff
