diff options
author | Kim Alvefur <zash@zash.se> | 2018-05-22 22:25:59 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-05-22 22:25:59 +0200 |
commit | 5815bbfc2586899d514bc2b2dfd56c69b9939ed0 (patch) | |
tree | 54d397a353338cb5ac1a004ec5f86cc834a06248 /spec/json | |
parent | d11db6533450a7ac6324963ab6245032ff5b3ba9 (diff) | |
parent | 99ded745a65df5d35a5d4aad15c6acad34ea73c9 (diff) | |
download | prosody-5815bbfc2586899d514bc2b2dfd56c69b9939ed0.tar.gz prosody-5815bbfc2586899d514bc2b2dfd56c69b9939ed0.zip |
Merge 0.10->trunk
Diffstat (limited to 'spec/json')
0 files changed, 0 insertions, 0 deletions