diff options
author | Kim Alvefur <zash@zash.se> | 2017-09-14 02:48:34 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-09-14 02:48:34 +0200 |
commit | 4c6c255113df008869577d4ec0291ff880b1273c (patch) | |
tree | ae64d69a765500ad798ce354363683ab22571fa3 /spec/json | |
parent | 4cfc3d05d585eca546786a0273243f97b70dd20d (diff) | |
parent | 989c0783cb8fd86874f5f0bdcbdba30522e5fcb3 (diff) | |
download | prosody-4c6c255113df008869577d4ec0291ff880b1273c.tar.gz prosody-4c6c255113df008869577d4ec0291ff880b1273c.zip |
Merge 0.10->trunk
Diffstat (limited to 'spec/json')
0 files changed, 0 insertions, 0 deletions