aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-12-17 15:42:54 +0100
committerKim Alvefur <zash@zash.se>2018-12-17 15:42:54 +0100
commit273523a27617d2b320a811c0e978111ae3d6e23b (patch)
treef2cce570497aa822c6eb077eb9597b810671ebb6 /prosody
parent24a020bbaa7d9d99d26330e2639f9249511f84cd (diff)
parent59c09fa60424dfe11e784896519c2a81a814437e (diff)
downloadprosody-273523a27617d2b320a811c0e978111ae3d6e23b.tar.gz
prosody-273523a27617d2b320a811c0e978111ae3d6e23b.zip
Merge 0.11->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions