diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-21 02:43:38 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-21 02:43:38 +0200 |
commit | b5a7d2f77bbf1990fc9da09469d93c179fc2f2e4 (patch) | |
tree | b383147eebb56b96cc27488ef4247a6444dd9088 /prosody.cfg.lua.dist | |
parent | 5c9b1e7c12e66e518237b17f26629b7da6198a4c (diff) | |
parent | 2b09f7cffb7c04ec127d75b2776d8938f8ac2441 (diff) | |
download | prosody-b5a7d2f77bbf1990fc9da09469d93c179fc2f2e4.tar.gz prosody-b5a7d2f77bbf1990fc9da09469d93c179fc2f2e4.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions