Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 7425:0bb98138dacf
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 12 May 2016 18:45:59 +0100 |
| parents | a5a080c12c96 |
| children | 3ae19750cd46 |
comparison
equal
deleted
inserted
replaced
| 7423:63141a85beea | 7425:0bb98138dacf |
|---|