aboutsummaryrefslogtreecommitdiffstats
path: root/tests/json
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-12 20:59:18 +0200
committerKim Alvefur <zash@zash.se>2017-04-12 20:59:18 +0200
commita22c6725be05e65b0ccde5b8e2b8eb22944a3426 (patch)
tree812565071e2a3b84ab2fee8ca331e5be4b6e63e7 /tests/json
parent8a9dd05b08a3a85b84680547e9b0f2027499fd37 (diff)
parentb3cd19063f63fa426f35523bfb77be45d1e0dd4e (diff)
downloadprosody-a22c6725be05e65b0ccde5b8e2b8eb22944a3426.tar.gz
prosody-a22c6725be05e65b0ccde5b8e2b8eb22944a3426.zip
Merge 0.10->trunk
Diffstat (limited to 'tests/json')
0 files changed, 0 insertions, 0 deletions