diff options
author | Kim Alvefur <zash@zash.se> | 2017-06-01 14:05:58 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-06-01 14:05:58 +0200 |
commit | 6fc795d35e8ca0e99828e7536099f9cd9b9b4433 (patch) | |
tree | 241ce473feccaef38dcf409ebac3d60868fc6a72 /COPYING | |
parent | ab47caa72fdcefdcc2fd5c39c1a8300a64aa9125 (diff) | |
parent | aa3eb08cef920e003252cca86120323e14111b52 (diff) | |
download | prosody-6fc795d35e8ca0e99828e7536099f9cd9b9b4433.tar.gz prosody-6fc795d35e8ca0e99828e7536099f9cd9b9b4433.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions