Mercurial > prosody-hg
comparison plugins/mod_s2s/s2sout.lib.lua @ 7282:29eedc776bbd
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 14 Mar 2016 18:27:32 +0100 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |
comparison
equal
deleted
inserted
replaced
| 7280:8b5a9208c212 | 7282:29eedc776bbd |
|---|
