diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-24 21:24:03 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-24 21:24:03 +0100 |
commit | 0c22ed35793dc8b751dea8c89e418986efd8aa08 (patch) | |
tree | cf044930d3acbcf06fd592cc90f3b19d609f9f22 /tests/json | |
parent | d020c4eab4880ae5989839ede92ff847d65dd5a8 (diff) | |
parent | 2c33b9b47d9f85a81b25cfc5ebebdc1fb5aa6864 (diff) | |
download | prosody-0c22ed35793dc8b751dea8c89e418986efd8aa08.tar.gz prosody-0c22ed35793dc8b751dea8c89e418986efd8aa08.zip |
Merge 0.10->trunk
Diffstat (limited to 'tests/json')
0 files changed, 0 insertions, 0 deletions