aboutsummaryrefslogtreecommitdiffstats
path: root/prosody.cfg.lua.dist
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-10-06 23:53:15 +0200
committerKim Alvefur <zash@zash.se>2013-10-06 23:53:15 +0200
commitdbb308a3935ce41afa777500b828ed21bb7e508a (patch)
tree1ccbde825f880f744b016ca177445a7de83a00e5 /prosody.cfg.lua.dist
parent4fda0169d29af6047dd71840f879ee38e9c23878 (diff)
parent087ed3fedce82fe59e6ed593ccf13928071d5e9e (diff)
downloadprosody-dbb308a3935ce41afa777500b828ed21bb7e508a.tar.gz
prosody-dbb308a3935ce41afa777500b828ed21bb7e508a.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions