Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6843:161cccfdf015
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 22 Sep 2015 01:31:52 +0200 |
| parents | b2e89583d6e6 |
| children | c314e9142e9d |
comparison
equal
deleted
inserted
replaced
| 6839:298182fd2387 | 6843:161cccfdf015 |
|---|
