aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-03-04 13:46:09 +0100
committerKim Alvefur <zash@zash.se>2019-03-04 13:46:09 +0100
commit2326bed3c7b2386aa1706ad0e760827ef2e165ce (patch)
treee47cbfb67c4f98b179baec19c2f4fd66e62f7132 /core
parent9c9d32e7e69af9aa59c1937b91bc41525d584144 (diff)
parent09a662026a3fc4c69eda9d8ef8862abac5569625 (diff)
downloadprosody-2326bed3c7b2386aa1706ad0e760827ef2e165ce.tar.gz
prosody-2326bed3c7b2386aa1706ad0e760827ef2e165ce.zip
Merge 0.11->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions