diff options
author | Kim Alvefur <zash@zash.se> | 2015-05-13 22:31:59 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-05-13 22:31:59 +0200 |
commit | 870f8edb12cbfd94768cd348c3d7445b58ab0a86 (patch) | |
tree | a1194a8507fd6aba43f775983a36e82bbb8c2448 /prosody.cfg.lua.dist | |
parent | 9bd85eabf029220d25431ab17bc86bf308b51b8d (diff) | |
parent | bbdd807af4b5bb1a5cf78accefa26f7f36e4668f (diff) | |
download | prosody-870f8edb12cbfd94768cd348c3d7445b58ab0a86.tar.gz prosody-870f8edb12cbfd94768cd348c3d7445b58ab0a86.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions