Mercurial > prosody-hg
comparison plugins/mod_s2s/s2sout.lib.lua @ 7341:aa94cd27df4d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 06 Apr 2016 14:50:34 +0200 |
| parents | 5286e79c6829 |
| children | ab8324d3b899 |
comparison
equal
deleted
inserted
replaced
| 7338:f8d37227acd7 | 7341:aa94cd27df4d |
|---|
