aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-29 15:38:14 +0200
committerKim Alvefur <zash@zash.se>2016-03-29 15:38:14 +0200
commit467b6b0bfe3b69ac9c178ff06b310bb58d4b6617 (patch)
treefe70196be61487570b1e5364d6a2d114791755bd /prosody.cfg.lua.dist
parentde9765e47979b869c15302e9b7ebb69cc4f9503c (diff)
parent411cd234e3a023091df223211419eceaac832f73 (diff)
downloadprosody-467b6b0bfe3b69ac9c178ff06b310bb58d4b6617.tar.gz
prosody-467b6b0bfe3b69ac9c178ff06b310bb58d4b6617.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions