Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 7808:0494bf73dfee
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 04 Jan 2017 10:53:16 +0100 |
| parents | 8e43a05e2374 |
| children | 42fad8465537 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 04 Jan 2017 10:53:16 +0100 |
| parents | 8e43a05e2374 |
| children | 42fad8465537 |