aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-10 16:59:21 +0100
committerKim Alvefur <zash@zash.se>2017-03-10 16:59:21 +0100
commit08c9156f20fe9700913f5b97e6199b396ed6a87f (patch)
treeaf21ea2d626caddb6c0e6f4b50e16a21dfb2b2f8 /prosody.cfg.lua.dist
parentb0eec64a3f56ee4020f2d328e6d51a07f45cab53 (diff)
parent384687ffa49ac61dddb91be1ec5de1572ba2c036 (diff)
downloadprosody-08c9156f20fe9700913f5b97e6199b396ed6a87f.tar.gz
prosody-08c9156f20fe9700913f5b97e6199b396ed6a87f.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions