diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-23 14:46:41 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-23 14:46:41 +0100 |
| commit | fcaed765157cd655ef028f74994bf4033912de2c (patch) | |
| tree | 8b83e6ac3c8e3a44e10fa1f3f739fbcdf36d0a7c /core | |
| parent | 597d3174276ee35ac59a7eb2109469126d054310 (diff) | |
| parent | 4f82974fa80987ebe9b2ebc3c88564c529787903 (diff) | |
| download | prosody-fcaed765157cd655ef028f74994bf4033912de2c.tar.gz prosody-fcaed765157cd655ef028f74994bf4033912de2c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions