aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-02-24 11:51:43 +0100
committerKim Alvefur <zash@zash.se>2018-02-24 11:51:43 +0100
commit9867bc9a1d58a63298e2423f658977329c80345e (patch)
tree526ebbe170576e4da16af5d57eb49dabbaccaf2b /core
parent18b6b5c90b406a3171134c78e3a9d68a2fa8cdea (diff)
parent4f92c540b6a40b892601b37c93e802e328c47259 (diff)
downloadprosody-9867bc9a1d58a63298e2423f658977329c80345e.tar.gz
prosody-9867bc9a1d58a63298e2423f658977329c80345e.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions