Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6312:1940a014aeca
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2014 13:01:57 +0100 |
| parents | 2fdd71b08126 |
| children | 92d009af6eba |
comparison
equal
deleted
inserted
replaced
| 6306:c6d9e21cd5f2 | 6312:1940a014aeca |
|---|