Mercurial > prosody-hg
diff plugins/mod_s2s/mod_s2s.lua @ 6826:17a4e89a4780
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 04 Sep 2015 11:11:40 +0100 |
| parents | b2e89583d6e6 |
| children | c314e9142e9d |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 04 Sep 2015 11:11:40 +0100 |
| parents | b2e89583d6e6 |
| children | c314e9142e9d |