diff options
author | Kim Alvefur <zash@zash.se> | 2017-11-07 09:29:04 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-11-07 09:29:04 +0100 |
commit | b65f1ed9c128529d27ebe05912cfd9a95ad25fc8 (patch) | |
tree | c5324b65d949a7b05c6acc45c22fa0e40085dbb5 /prosody | |
parent | 30bb916e5656f1860d6d2c7808ade37c84c75c63 (diff) | |
parent | eb07e55b143ffada5d2bf2b697996ee0bab4d2b5 (diff) | |
download | prosody-b65f1ed9c128529d27ebe05912cfd9a95ad25fc8.tar.gz prosody-b65f1ed9c128529d27ebe05912cfd9a95ad25fc8.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions