diff options
author | Kim Alvefur <zash@zash.se> | 2015-01-26 15:25:16 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-01-26 15:25:16 +0100 |
commit | 26854f710c5d0c038738ddfda11406ce13a4536a (patch) | |
tree | c07999d097746e84683ab1fb9b60ceebce94421d /prosody.cfg.lua.dist | |
parent | 5723bad906dcbef98eb1cdc196675a7a526f97cc (diff) | |
parent | ff0710136d0c83566bd49e7ba2536502babafd15 (diff) | |
download | prosody-26854f710c5d0c038738ddfda11406ce13a4536a.tar.gz prosody-26854f710c5d0c038738ddfda11406ce13a4536a.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions