aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-06-22 14:18:36 +0200
committerKim Alvefur <zash@zash.se>2018-06-22 14:18:36 +0200
commitba4bd1e687fff494493a543e6c472ea272f4ec62 (patch)
tree55445e82c4dcde919a836d2d40e78cc026d61b4a /prosody.cfg.lua.dist
parenta346709487fd665dbcca39a92f7d0bd3b519a9bc (diff)
parent899924566ef8a30745387efac5003536d3ffd088 (diff)
downloadprosody-ba4bd1e687fff494493a543e6c472ea272f4ec62.tar.gz
prosody-ba4bd1e687fff494493a543e6c472ea272f4ec62.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions