diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-28 20:14:35 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-28 20:14:35 +0200 |
| commit | 0646752a74aa5f7f0383000d64cd669474209d22 (patch) | |
| tree | 596c926edd7d0a89f2919aad8b9554b048283f75 /CHANGES | |
| parent | f3b670d9bb5953f68b381046a6368baf3cf0f301 (diff) | |
| parent | bcc0a4f11d07b3ff01011790c33abf1b4298c244 (diff) | |
| download | prosody-0646752a74aa5f7f0383000d64cd669474209d22.tar.gz prosody-0646752a74aa5f7f0383000d64cd669474209d22.zip | |
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions