aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-25 21:35:09 +0200
committerKim Alvefur <zash@zash.se>2016-05-25 21:35:09 +0200
commit713422034f373d676d484d3f40fee0667416a25a (patch)
tree3556e1c72692e7f3e51123d92fbdc1d6ed34e820 /prosody.cfg.lua.dist
parent4ba59d52f26e0fc37af41eecc501e21cd6b0aff4 (diff)
parent0fd7323ab79f69224bdd868ecabb2f3f6aed4e36 (diff)
downloadprosody-713422034f373d676d484d3f40fee0667416a25a.tar.gz
prosody-713422034f373d676d484d3f40fee0667416a25a.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions