aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-09-28 03:08:03 +0200
committerKim Alvefur <zash@zash.se>2014-09-28 03:08:03 +0200
commit86ecafd352319cb4467fd289cc8f3bd503356282 (patch)
tree1e1b1c706f621ef388116c625cce1b601d21c2f5 /prosody.cfg.lua.dist
parent16c34e7fd48ca743c9733f357abd18b1c62a0703 (diff)
parentb33b263b340740a6a98070899277bab8ada84968 (diff)
downloadprosody-86ecafd352319cb4467fd289cc8f3bd503356282.tar.gz
prosody-86ecafd352319cb4467fd289cc8f3bd503356282.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions