aboutsummaryrefslogtreecommitdiffstats
path: root/spec/json
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-11-03 01:17:53 +0100
committerKim Alvefur <zash@zash.se>2017-11-03 01:17:53 +0100
commit2bcf7f60228b03925ea774f795839f5eec7f9cf5 (patch)
tree1b26745b4408f42a4919b6f5161132763178f52c /spec/json
parent1ee76f7ddb1a2c501d8e05db46092952ff2512ff (diff)
parentbfef1b1fa64bda1313d890b14c972cb34f399489 (diff)
downloadprosody-2bcf7f60228b03925ea774f795839f5eec7f9cf5.tar.gz
prosody-2bcf7f60228b03925ea774f795839f5eec7f9cf5.zip
Merge 0.10->trunk
Diffstat (limited to 'spec/json')
0 files changed, 0 insertions, 0 deletions