diff options
author | Kim Alvefur <zash@zash.se> | 2017-12-29 20:50:07 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-12-29 20:50:07 +0100 |
commit | 7026ec90060954062365b75c9974eb8045d9f548 (patch) | |
tree | f99617f5697506024e44291a1efd56e81a69f031 /spec/json | |
parent | e6ada2cc8cac45d403590bb499c65a8b817f3658 (diff) | |
parent | 76d18a84640f7083f658776d66a7833f067e0377 (diff) | |
download | prosody-7026ec90060954062365b75c9974eb8045d9f548.tar.gz prosody-7026ec90060954062365b75c9974eb8045d9f548.zip |
Merge 0.10->trunk
Diffstat (limited to 'spec/json')
0 files changed, 0 insertions, 0 deletions