diff options
author | Kim Alvefur <zash@zash.se> | 2018-06-10 01:20:05 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-06-10 01:20:05 +0200 |
commit | 3807dcbeb3ffc348386428e75223adbf80c3bcff (patch) | |
tree | 349dd0220f89e02d73610850acd422d6862ffe4c /prosody | |
parent | f04c5325ab047524d5b81debd134adbfa6aae245 (diff) | |
parent | 03a94333a63c22e8d5b9d9c16620152ef54d2187 (diff) | |
download | prosody-3807dcbeb3ffc348386428e75223adbf80c3bcff.tar.gz prosody-3807dcbeb3ffc348386428e75223adbf80c3bcff.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions