diff options
author | Kim Alvefur <zash@zash.se> | 2018-02-24 11:51:43 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-02-24 11:51:43 +0100 |
commit | 9867bc9a1d58a63298e2423f658977329c80345e (patch) | |
tree | 526ebbe170576e4da16af5d57eb49dabbaccaf2b /core | |
parent | 18b6b5c90b406a3171134c78e3a9d68a2fa8cdea (diff) | |
parent | 4f92c540b6a40b892601b37c93e802e328c47259 (diff) | |
download | prosody-9867bc9a1d58a63298e2423f658977329c80345e.tar.gz prosody-9867bc9a1d58a63298e2423f658977329c80345e.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions