aboutsummaryrefslogtreecommitdiffstats
path: root/tests/json
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-26 20:11:03 +0100
committerKim Alvefur <zash@zash.se>2016-11-26 20:11:03 +0100
commit728d74d8bf721e7f9377bcdeea7e456f15d0e856 (patch)
tree5fafe37e76936f880749432bffa3174a7ca120cd /tests/json
parentc8bbcabaf7597f13bace9e5aefc98ecb9e172796 (diff)
parent1b95aabe8959649223e49482b31eea221844d7a3 (diff)
downloadprosody-728d74d8bf721e7f9377bcdeea7e456f15d0e856.tar.gz
prosody-728d74d8bf721e7f9377bcdeea7e456f15d0e856.zip
Merge 0.10->trunk
Diffstat (limited to 'tests/json')
0 files changed, 0 insertions, 0 deletions