diff options
| author | Kim Alvefur <zash@zash.se> | 2017-07-06 11:24:36 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-07-06 11:24:36 +0200 |
| commit | aca11d8afe0573dd1573356bd14edd4bb823a187 (patch) | |
| tree | d54d6743becde2246fed6859f25ec6ee72e0d080 /core | |
| parent | f99d0138bf2fc1eefcc8954e2a3d0ac41419ca85 (diff) | |
| parent | b5181287340558c4e97cd2a3b08b84840cd80c9a (diff) | |
| download | prosody-aca11d8afe0573dd1573356bd14edd4bb823a187.tar.gz prosody-aca11d8afe0573dd1573356bd14edd4bb823a187.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions