diff options
author | Kim Alvefur <zash@zash.se> | 2016-12-05 12:29:21 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-12-05 12:29:21 +0100 |
commit | 0031f4db2cd964b2f0bec5c6292a30107ee68c60 (patch) | |
tree | d8491d1afbee7ca428e0a6129a47dcdd9661dca7 /prosody.cfg.lua.dist | |
parent | 5edecf159e4a7da6a5b8edccc9766a8119f8b69c (diff) | |
parent | cc617421b1b118c4bfa7067f4ff6a3ee001143f1 (diff) | |
download | prosody-0031f4db2cd964b2f0bec5c6292a30107ee68c60.tar.gz prosody-0031f4db2cd964b2f0bec5c6292a30107ee68c60.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions