aboutsummaryrefslogtreecommitdiffstats
path: root/tests/json
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-24 15:58:16 +0200
committerKim Alvefur <zash@zash.se>2016-08-24 15:58:16 +0200
commitcca5b1dec7762e7f5549a2b387a72e9fda602809 (patch)
treea9f286140e23e9cc136e466abae7e832d375d2c7 /tests/json
parentc4e4d69aaa914047749f6394c2d42ccf95244a0c (diff)
parent266c9ad4eb1f23e6edba5201762007ac3a7419a1 (diff)
downloadprosody-cca5b1dec7762e7f5549a2b387a72e9fda602809.tar.gz
prosody-cca5b1dec7762e7f5549a2b387a72e9fda602809.zip
Merge 0.10->trunk
Diffstat (limited to 'tests/json')
0 files changed, 0 insertions, 0 deletions