diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-18 11:55:40 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-18 11:55:40 +0100 |
commit | 5092b5f5d2b4a0ae0d8812fa09817b314e995969 (patch) | |
tree | 6946e0e43dd34b23c09d076f1a417705b15d71cc /CHANGES | |
parent | 94c745e8e83bcabc945e93ebffb5f5eead5544bf (diff) | |
parent | 42f15c4eb2f1b52b886f70eefe9c89697e825529 (diff) | |
download | prosody-5092b5f5d2b4a0ae0d8812fa09817b314e995969.tar.gz prosody-5092b5f5d2b4a0ae0d8812fa09817b314e995969.zip |
Merge
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions