aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-04 10:53:12 +0100
committerKim Alvefur <zash@zash.se>2017-01-04 10:53:12 +0100
commitf5f1dd31ef472f6ad9f50ed0be861dfadf1b0542 (patch)
treeb5352fa96c0d254fa0109ef658e09fa0257608b5 /prosody
parent0516532553fea667f2f96145ed93eac85ee9135c (diff)
parent05077e583bd1ae35f974092be6fe5f5260cbf6ea (diff)
downloadprosody-f5f1dd31ef472f6ad9f50ed0be861dfadf1b0542.tar.gz
prosody-f5f1dd31ef472f6ad9f50ed0be861dfadf1b0542.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions