diff options
author | Kim Alvefur <zash@zash.se> | 2017-05-17 01:06:20 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-05-17 01:06:20 +0200 |
commit | 9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7 (patch) | |
tree | 87920ea2589baddc568772aeebb1fda17b5c9e0c /core | |
parent | d300932f7b75b891e6dfcf7d568d796c227b9502 (diff) | |
parent | 8c3f6bd236ef6addc1dda80d42d6fd73acc4e1f5 (diff) | |
download | prosody-9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7.tar.gz prosody-9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions