diff options
author | Kim Alvefur <zash@zash.se> | 2017-11-20 02:22:09 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-11-20 02:22:09 +0100 |
commit | 38c157896a7541d903cdf1c09c0cafa35c5d7820 (patch) | |
tree | 94dfc9879b58e8282a37d596ac225b9832af260a /prosody.cfg.lua.dist | |
parent | b158553c4326f3f3e8d6cac3a0362e48b3e09d64 (diff) | |
parent | 0158bad7ad35279d64096ee86defdf4c04532ece (diff) | |
download | prosody-38c157896a7541d903cdf1c09c0cafa35c5d7820.tar.gz prosody-38c157896a7541d903cdf1c09c0cafa35c5d7820.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions