diff options
author | Kim Alvefur <zash@zash.se> | 2017-03-27 18:30:11 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-03-27 18:30:11 +0200 |
commit | e4c17b311b1f0880958aaf93ad31c00872a7c719 (patch) | |
tree | afbf0fa015e2dd67b0e0977ded34834eee4830aa /COPYING | |
parent | 9f1fee2164611477a30935cb3a2f08abdff56f60 (diff) | |
parent | 9c6c576f099d4f4f71edde0c47df60178b888afb (diff) | |
download | prosody-e4c17b311b1f0880958aaf93ad31c00872a7c719.tar.gz prosody-e4c17b311b1f0880958aaf93ad31c00872a7c719.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions