diff options
author | Kim Alvefur <zash@zash.se> | 2018-09-08 11:42:22 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-09-08 11:42:22 +0200 |
commit | 02b648d54f973e311001509960510da02a76e9c9 (patch) | |
tree | 9908168db100e53afc5d0fba348e40665ea5d386 /prosody.cfg.lua.dist | |
parent | 8d7eede4acd38f3620c9d1afa154286a69c367b1 (diff) | |
parent | 4d3ba7e40775e933a70283cd97c385f4c88038cb (diff) | |
download | prosody-02b648d54f973e311001509960510da02a76e9c9.tar.gz prosody-02b648d54f973e311001509960510da02a76e9c9.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions