diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-12 19:26:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-12 19:26:54 +0100 |
| commit | 08f04b1419c2c8878d3836d11cd7af806a083898 (patch) | |
| tree | 6eb49f8bddde74f4f7a621d0fb2770d60c093b4f /prosody.cfg.lua.dist | |
| parent | db97ec41b600653e046c0d6ee7c2625105a5a761 (diff) | |
| parent | a0ece01720887a029783f813da186d624aa41ba8 (diff) | |
| download | prosody-08f04b1419c2c8878d3836d11cd7af806a083898.tar.gz prosody-08f04b1419c2c8878d3836d11cd7af806a083898.zip | |
Merge 0.10 -> trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions