Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 7179:bfa3b2ee384c
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 22 Feb 2016 15:24:20 +0100 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 22 Feb 2016 15:24:20 +0100 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |