diff options
author | Kim Alvefur <zash@zash.se> | 2017-01-23 19:34:14 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2017-01-23 19:34:14 +0100 |
commit | db88e0f7b51eeaed68b9b50502b6ba82c53633a1 (patch) | |
tree | ea895b1073f2ff2de7a08fc01f12797ab58c7125 /prosody.cfg.lua.dist | |
parent | 26f2953106794bbdd23db98f69fb6e90a4b8e460 (diff) | |
parent | ffde63fe687f5ffecf5fdec28358d1774a8a7169 (diff) | |
download | prosody-db88e0f7b51eeaed68b9b50502b6ba82c53633a1.tar.gz prosody-db88e0f7b51eeaed68b9b50502b6ba82c53633a1.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions