aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-04-08 00:48:15 +0200
committerKim Alvefur <zash@zash.se>2017-04-08 00:48:15 +0200
commitf2f1aa7473e3e9c668a77044c93560e3c914cc50 (patch)
treebc8f7022567cc5611e86b0f5636e9d8f9f35e46f /prosody
parent5354e5645ec328120cadd24a7dfa7139fd07ec60 (diff)
parent6b3a33a0835f774ab7e0f021d885b47b7631b7c4 (diff)
downloadprosody-f2f1aa7473e3e9c668a77044c93560e3c914cc50.tar.gz
prosody-f2f1aa7473e3e9c668a77044c93560e3c914cc50.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions