diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-23 19:34:14 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-23 19:34:14 +0100 |
commit | 468d3db1a1eb87026d20303eeda6ff46d459df80 (patch) | |
tree | ea895b1073f2ff2de7a08fc01f12797ab58c7125 /AUTHORS | |
parent | 4c567124f67372cba0b688120eb726ab543b8bf1 (diff) | |
parent | b54ba7235144f22208ce22ca31da705a62531935 (diff) | |
download | prosody-468d3db1a1eb87026d20303eeda6ff46d459df80.tar.gz prosody-468d3db1a1eb87026d20303eeda6ff46d459df80.zip |
Merge 0.10->trunk
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions