diff options
author | Kim Alvefur <zash@zash.se> | 2017-12-05 12:26:08 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-12-05 12:26:08 +0100 |
commit | 2c3887aa026cf8cab9f9bf7cd8a46185b6261696 (patch) | |
tree | 3f699a0df8571b1c9ba7410f82b611df191291ea /prosody | |
parent | d73bbfc4829d3bc7cc5c00dfcac47b98683f02d1 (diff) | |
parent | 5139d669fc8d8a2d25cdcbda9976031ed41ce644 (diff) | |
download | prosody-2c3887aa026cf8cab9f9bf7cd8a46185b6261696.tar.gz prosody-2c3887aa026cf8cab9f9bf7cd8a46185b6261696.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions