Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6525:7c273da3cff6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Nov 2014 15:01:47 +0100 |
| parents | 7c8f58d2b331 |
| children | 61b6a4fc65f1 64e6b88b6b21 |
comparison
equal
deleted
inserted
replaced
| 6516:ecd8d6437053 | 6525:7c273da3cff6 |
|---|