Mercurial > prosody-hg
diff plugins/mod_s2s/s2sout.lib.lua @ 7399:066a4dfdac18
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 Apr 2016 19:00:19 +0200 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 19 Apr 2016 19:00:19 +0200 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |