aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-22 15:24:20 +0100
committerKim Alvefur <zash@zash.se>2016-02-22 15:24:20 +0100
commitcccb4ab09be9573c02e0d2684e062363cd7eb068 (patch)
tree3bb6d5bb05f75122414728e4605bbdb9aacacae0 /prosody.cfg.lua.dist
parente13dc52b494737b8fa8e9c14ce68810782bee7aa (diff)
parent7ebc652e1dde5db4ba00782579a1948b912fa930 (diff)
downloadprosody-cccb4ab09be9573c02e0d2684e062363cd7eb068.tar.gz
prosody-cccb4ab09be9573c02e0d2684e062363cd7eb068.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions