diff options
author | Kim Alvefur <zash@zash.se> | 2018-10-24 17:18:34 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-10-24 17:18:34 +0200 |
commit | e12412bc080a70f9d90a4d42cede63b8119f3b34 (patch) | |
tree | e7bf7b44c00c856ddb4430a41fae7d5cfdd45ec1 /prosody | |
parent | 3d06d7c30922b8cd1d37bbd36f6bb8865eca19bf (diff) | |
parent | 2dd5ee93572d91455ad7bcf84e9555b756c5ffc5 (diff) | |
download | prosody-e12412bc080a70f9d90a4d42cede63b8119f3b34.tar.gz prosody-e12412bc080a70f9d90a4d42cede63b8119f3b34.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions