aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-16 22:44:43 +0100
committerKim Alvefur <zash@zash.se>2016-01-16 22:44:43 +0100
commitf763095b66a53b0fcc73f21a99478deabebd2a5b (patch)
treebde7b68581a288e5d3fc8a036c80502296972394 /prosody.cfg.lua.dist
parente49c053133ec90f007ba2f8575773f3cf5c20b54 (diff)
parent92a6c7fbd21fd445f3bdeca240030264b1756961 (diff)
downloadprosody-f763095b66a53b0fcc73f21a99478deabebd2a5b.tar.gz
prosody-f763095b66a53b0fcc73f21a99478deabebd2a5b.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions