aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-03 16:05:34 +0100
committerKim Alvefur <zash@zash.se>2016-03-03 16:05:34 +0100
commit3140ed3d626e976639ef5f38efb9790008834d9c (patch)
tree0e5182283ab5973a6cab6ea5667024cdd2f8a80a /prosody
parent89d089700746356babbe0af4251a95d9bf23b65e (diff)
parentae72fdd667dcc0fed977c1d0f20cc052390b6f1d (diff)
downloadprosody-3140ed3d626e976639ef5f38efb9790008834d9c.tar.gz
prosody-3140ed3d626e976639ef5f38efb9790008834d9c.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions