Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 7917:1ea3a8dc7dd5
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 25 Feb 2017 18:08:30 +0100 |
| parents | 8e43a05e2374 |
| children | 42fad8465537 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 25 Feb 2017 18:08:30 +0100 |
| parents | 8e43a05e2374 |
| children | 42fad8465537 |