aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-11-20 02:22:09 +0100
committerKim Alvefur <zash@zash.se>2017-11-20 02:22:09 +0100
commit38c157896a7541d903cdf1c09c0cafa35c5d7820 (patch)
tree94dfc9879b58e8282a37d596ac225b9832af260a /prosody.cfg.lua.dist
parentb158553c4326f3f3e8d6cac3a0362e48b3e09d64 (diff)
parent0158bad7ad35279d64096ee86defdf4c04532ece (diff)
downloadprosody-38c157896a7541d903cdf1c09c0cafa35c5d7820.tar.gz
prosody-38c157896a7541d903cdf1c09c0cafa35c5d7820.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions