aboutsummaryrefslogtreecommitdiffstats
path: root/tests/json
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-09 10:17:39 +0100
committerKim Alvefur <zash@zash.se>2017-01-09 10:17:39 +0100
commitfde889b4ececec3509342955533058672df4a2c3 (patch)
treef74647d6ef7f599b9f5283ae25b85c10ac124a2e /tests/json
parent3c6c798435a4197ea3d07db09ee5df58a1216b26 (diff)
parentd3f66c0848559e7f019aa50617052a0030f2df65 (diff)
downloadprosody-fde889b4ececec3509342955533058672df4a2c3.tar.gz
prosody-fde889b4ececec3509342955533058672df4a2c3.zip
Merge 0.10->trunk
Diffstat (limited to 'tests/json')
0 files changed, 0 insertions, 0 deletions