diff options
author | Kim Alvefur <zash@zash.se> | 2016-11-26 20:11:03 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-11-26 20:11:03 +0100 |
commit | 728d74d8bf721e7f9377bcdeea7e456f15d0e856 (patch) | |
tree | 5fafe37e76936f880749432bffa3174a7ca120cd /tools/xep227toprosody.lua | |
parent | c8bbcabaf7597f13bace9e5aefc98ecb9e172796 (diff) | |
parent | 1b95aabe8959649223e49482b31eea221844d7a3 (diff) | |
download | prosody-728d74d8bf721e7f9377bcdeea7e456f15d0e856.tar.gz prosody-728d74d8bf721e7f9377bcdeea7e456f15d0e856.zip |
Merge 0.10->trunk
Diffstat (limited to 'tools/xep227toprosody.lua')
0 files changed, 0 insertions, 0 deletions