Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 7191:df4f52cabdfe
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Feb 2016 11:20:00 +0100 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 24 Feb 2016 11:20:00 +0100 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |