diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-19 18:23:02 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-19 18:23:02 +0200 |
commit | be79af9fbb47f35b0bccf0337e8035e5b070d390 (patch) | |
tree | 5a75386f70ffd46bb5a5355f83af4749ca8134fb /prosody.cfg.lua.dist | |
parent | 7ec3aac1af0d965b32e71d760c02cc6a31a99655 (diff) | |
parent | 376dab8b5e1303db5400fda48a113b60c540d069 (diff) | |
download | prosody-be79af9fbb47f35b0bccf0337e8035e5b070d390.tar.gz prosody-be79af9fbb47f35b0bccf0337e8035e5b070d390.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions