Software / code / prosody
Changeset
7101:f83211f4d776
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 26 Jan 2016 14:15:00 +0100 |
| parents | 7098:5286e79c6829 (current diff) 7100:301d58705667 (diff) |
| children | 7102:250016f5eb7e 7106:74798480b52e |
| files | plugins/mod_c2s.lua plugins/mod_s2s/mod_s2s.lua |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff