diff options
author | Kim Alvefur <zash@zash.se> | 2018-12-17 15:42:54 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-12-17 15:42:54 +0100 |
commit | 273523a27617d2b320a811c0e978111ae3d6e23b (patch) | |
tree | f2cce570497aa822c6eb077eb9597b810671ebb6 /prosody | |
parent | 24a020bbaa7d9d99d26330e2639f9249511f84cd (diff) | |
parent | 59c09fa60424dfe11e784896519c2a81a814437e (diff) | |
download | prosody-273523a27617d2b320a811c0e978111ae3d6e23b.tar.gz prosody-273523a27617d2b320a811c0e978111ae3d6e23b.zip |
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions