diff options
| author | Kim Alvefur <zash@zash.se> | 2016-03-02 16:34:34 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-03-02 16:34:34 +0100 |
| commit | 0b702d28acf78831d94c75d4c239650ee1fe2c53 (patch) | |
| tree | 503e8a7491dba1c841c729de3c74b2b63d529298 /tests/json | |
| parent | 8e521f441ea38df4156e4945c564c11fefbffd17 (diff) | |
| parent | 70a7adc1c1340992b85b63c248fe913c199782e3 (diff) | |
| download | prosody-0b702d28acf78831d94c75d4c239650ee1fe2c53.tar.gz prosody-0b702d28acf78831d94c75d4c239650ee1fe2c53.zip | |
Merge 0.10->trunk
Diffstat (limited to 'tests/json')
0 files changed, 0 insertions, 0 deletions