Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6722:d022cb4486bd
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 19 May 2015 09:31:12 +0100 |
| parents | b2e89583d6e6 |
| children | c314e9142e9d |
comparison
equal
deleted
inserted
replaced
| 6705:c269ab6ab98a | 6722:d022cb4486bd |
|---|