diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-02 15:21:07 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-02 15:21:07 +0100 |
commit | 962ba796132d9dd59f7db308bbb0f633caf6bc0b (patch) | |
tree | c79d41ebf1b4a95c083a91e7f514089bc49d3823 /tests/json | |
parent | fd19cd42b0d97ead99d7af196d98d2ffdd51dcec (diff) | |
parent | d471c7b124575cb2657c0e80711e8803f797b25f (diff) | |
download | prosody-962ba796132d9dd59f7db308bbb0f633caf6bc0b.tar.gz prosody-962ba796132d9dd59f7db308bbb0f633caf6bc0b.zip |
Merge 0.9->0.10
Diffstat (limited to 'tests/json')
0 files changed, 0 insertions, 0 deletions