aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-26 20:11:03 +0100
committerKim Alvefur <zash@zash.se>2016-11-26 20:11:03 +0100
commit562a902d415f3a0962354c0f12776ec3e1db594f (patch)
tree5fafe37e76936f880749432bffa3174a7ca120cd /prosody
parentb17b81319300e94b7870e6e9c658f9528bd4c9b9 (diff)
parent234d7178f15e860dc6c624f1e16dd245372ec34d (diff)
downloadprosody-562a902d415f3a0962354c0f12776ec3e1db594f.tar.gz
prosody-562a902d415f3a0962354c0f12776ec3e1db594f.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions