aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-17 23:20:41 +0100
committerKim Alvefur <zash@zash.se>2016-11-17 23:20:41 +0100
commit59e7a632af33944016e3cbdb8a787a82188314ba (patch)
treeb62d53ea2041a4fa193e4b0c160fc308c8151b8a /core
parent07da428d332ef485dc4aea2f14cde5642fb0ba78 (diff)
parenta89c193bb2127ba3c7756bfb8a9687ac2f944821 (diff)
downloadprosody-59e7a632af33944016e3cbdb8a787a82188314ba.tar.gz
prosody-59e7a632af33944016e3cbdb8a787a82188314ba.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions