Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 7892:f00943bbf84f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 14 Feb 2017 23:42:11 +0100 |
| parents | 8e43a05e2374 |
| children | 42fad8465537 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 14 Feb 2017 23:42:11 +0100 |
| parents | 8e43a05e2374 |
| children | 42fad8465537 |