Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6965:5360bdf93fce
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 03 Dec 2015 16:13:33 +0000 |
| parents | 0e81e3dab896 |
| children | 250016f5eb7e |
comparison
equal
deleted
inserted
replaced
| 6964:ed5440a6ef7f | 6965:5360bdf93fce |
|---|