aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-05-20 15:00:50 +0200
committerKim Alvefur <zash@zash.se>2017-05-20 15:00:50 +0200
commit30cd746fdf8e16e49abbcbd80a3d0c0bf619ac67 (patch)
treea9f889946fe0b378627047ddcff3fe5e45fcc1ff /core
parentcdb000e818930f9622ecf4bdacae7a9c6ca80a2f (diff)
parent06b5c50c4e4751e54ca01175d2898bb88cd84819 (diff)
downloadprosody-30cd746fdf8e16e49abbcbd80a3d0c0bf619ac67.tar.gz
prosody-30cd746fdf8e16e49abbcbd80a3d0c0bf619ac67.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions