aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-05 00:28:30 +0100
committerKim Alvefur <zash@zash.se>2016-11-05 00:28:30 +0100
commit07da428d332ef485dc4aea2f14cde5642fb0ba78 (patch)
treeead046279a47ea5984c334f0c6500d85f5970dc8 /prosody.cfg.lua.dist
parent78fdfac11b141a83604a2887bb831206f71bef54 (diff)
parent02919f09518951d7561b8adbb843e88c6fc262ac (diff)
downloadprosody-07da428d332ef485dc4aea2f14cde5642fb0ba78.tar.gz
prosody-07da428d332ef485dc4aea2f14cde5642fb0ba78.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions