aboutsummaryrefslogtreecommitdiffstats
path: root/spec/json
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-09-29 13:45:03 +0200
committerKim Alvefur <zash@zash.se>2017-09-29 13:45:03 +0200
commitca622317f100d67023e2088179011eb61a243a2d (patch)
treecd04cb8a03e077a91511ed8d509a4e2e83588628 /spec/json
parentdb450adf9e7f6dbb96cddb15a8b929f367435981 (diff)
parent37d1497aedaf666ed0a1c4d5eeb47c54b1efd98c (diff)
downloadprosody-ca622317f100d67023e2088179011eb61a243a2d.tar.gz
prosody-ca622317f100d67023e2088179011eb61a243a2d.zip
Merge 0.10->trunk
Diffstat (limited to 'spec/json')
0 files changed, 0 insertions, 0 deletions