diff options
author | Kim Alvefur <zash@zash.se> | 2019-05-27 12:14:05 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-05-27 12:14:05 +0200 |
commit | 58b5ba4345e115ac259166cd84b6f8a42d15d0f8 (patch) | |
tree | 11248c94eefafeeb2e726b13fb690a3413e5982a /prosody | |
parent | 6fcaa64f6139a5093a328b2458ea4ac74a153d51 (diff) | |
parent | 3bf9f59c008d66f9995ff93eb204514ad852c454 (diff) | |
download | prosody-58b5ba4345e115ac259166cd84b6f8a42d15d0f8.tar.gz prosody-58b5ba4345e115ac259166cd84b6f8a42d15d0f8.zip |
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions