aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-01 23:31:13 +0100
committerKim Alvefur <zash@zash.se>2016-01-01 23:31:13 +0100
commit93408770ef53ce0056d7a875f79b053f218eb806 (patch)
treea9ef4016bba631979da88bc38fcbe9bd1d1de574 /prosody.cfg.lua.dist
parente1b247f298550899a261e9188784154dec7f4c15 (diff)
parentdef9cf77e81a56f1b91b429deebcd98462e929f7 (diff)
downloadprosody-93408770ef53ce0056d7a875f79b053f218eb806.tar.gz
prosody-93408770ef53ce0056d7a875f79b053f218eb806.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions