aboutsummaryrefslogtreecommitdiffstats
path: root/tests/json
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-06-01 14:05:43 +0200
committerKim Alvefur <zash@zash.se>2017-06-01 14:05:43 +0200
commitaa3eb08cef920e003252cca86120323e14111b52 (patch)
tree49c53bc5895483fbc4eb99b4df317d4c66870b40 /tests/json
parentf65858dd27db2c7d20d80d962e6b4b7ca2858374 (diff)
parentec9e9df9c7cb152c83fc3a2adf40228443cf1799 (diff)
downloadprosody-aa3eb08cef920e003252cca86120323e14111b52.tar.gz
prosody-aa3eb08cef920e003252cca86120323e14111b52.zip
Merge 0.9->0.10
Diffstat (limited to 'tests/json')
0 files changed, 0 insertions, 0 deletions