aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-09-04 10:08:04 +0200
committerKim Alvefur <zash@zash.se>2017-09-04 10:08:04 +0200
commitddf70a591a8bac7f104e278f2c813308a816d30b (patch)
treefc5e28b3a1a7589baf2085ec160cc91b1b9ae6b2 /core
parent4e7a2d21e80babc720d2ce60477d3792f8b446f0 (diff)
parent3888136262d43c5ca7ac20b50173d8957de96e58 (diff)
downloadprosody-ddf70a591a8bac7f104e278f2c813308a816d30b.tar.gz
prosody-ddf70a591a8bac7f104e278f2c813308a816d30b.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions