aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-02 23:03:02 +0100
committerKim Alvefur <zash@zash.se>2017-03-02 23:03:02 +0100
commit8b9646fee679b47520503b7eaafff9539a3ea3f2 (patch)
tree4b71bdc7622635a101579c04b2d9e0c56991df2c /prosody.cfg.lua.dist
parent55ba289bedc1580f49af034b8a849958b698de77 (diff)
parentc0937dcdb42f9ac2fc928aa91f1474607b735590 (diff)
downloadprosody-8b9646fee679b47520503b7eaafff9539a3ea3f2.tar.gz
prosody-8b9646fee679b47520503b7eaafff9539a3ea3f2.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions