aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-11-10 17:47:50 +0100
committerKim Alvefur <zash@zash.se>2017-11-10 17:47:50 +0100
commitb27c0335f178ca2bfb7baaecb164302dec5e6a47 (patch)
tree2750c26e7e3d4b905a6bae5249c5d34208501c39 /core
parent0251f343054715fd750860ad537fa16a0419df65 (diff)
parent2b87305e904ea6d364ba072be3c409fb0b933dd4 (diff)
downloadprosody-b27c0335f178ca2bfb7baaecb164302dec5e6a47.tar.gz
prosody-b27c0335f178ca2bfb7baaecb164302dec5e6a47.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions