Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 7496:98c8d14be4ef
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Jul 2016 18:43:28 +0200 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Jul 2016 18:43:28 +0200 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |