aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-28 15:14:11 +0100
committerKim Alvefur <zash@zash.se>2012-12-28 15:14:11 +0100
commit18d85d2a745f67eb48fdf20328e81857e04c6261 (patch)
tree0203d6bd6df69296fe7defc78a44293a3e08767d /prosody.cfg.lua.dist
parent61201a751bacfdfc9e019d9801750be70cf79f46 (diff)
parent4f4bc7973a3f9f754b4576403b9da8d304472055 (diff)
downloadprosody-18d85d2a745f67eb48fdf20328e81857e04c6261.tar.gz
prosody-18d85d2a745f67eb48fdf20328e81857e04c6261.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions