aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-18 00:08:58 +0100
committerKim Alvefur <zash@zash.se>2016-03-18 00:08:58 +0100
commitf76d7cdfb91850381b47ec3abfbc280f32136682 (patch)
treed187e41d01f81f41766abe3c0a730dde7b8c029f /core
parenta8a26e0472703832c51ded651a1860a26b1baff7 (diff)
parent4633eb56fbfda4ba0e5d790203282f374c8a8079 (diff)
downloadprosody-f76d7cdfb91850381b47ec3abfbc280f32136682.tar.gz
prosody-f76d7cdfb91850381b47ec3abfbc280f32136682.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions