Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 6775:22c8deb43daf
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 11 Aug 2015 10:29:25 +0200 |
| parents | b2e89583d6e6 |
| children | c314e9142e9d |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 11 Aug 2015 10:29:25 +0200 |
| parents | b2e89583d6e6 |
| children | c314e9142e9d |