diff options
| author | Kim Alvefur <zash@zash.se> | 2015-09-27 00:37:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-09-27 00:37:18 +0200 |
| commit | 3fc78cf2154d9a870763a06801bd167ddabf1c61 (patch) | |
| tree | 2e6a296aac1eb2dbf8f40a56235d32870b270b99 /prosody.cfg.lua.dist | |
| parent | a8ff283e3d24ebdd007050e37106ac786af2eaee (diff) | |
| parent | 23fa3312e7d966a9205274189eb6b5d0d793c3be (diff) | |
| download | prosody-3fc78cf2154d9a870763a06801bd167ddabf1c61.tar.gz prosody-3fc78cf2154d9a870763a06801bd167ddabf1c61.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions