diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-11 01:17:56 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-11 01:17:56 +0200 |
| commit | fb0e709aa2d5fb52da6fb643a3cdfd921e8cde33 (patch) | |
| tree | 147e215854eea3b4657112876b5c45863c73acc8 /prosody.cfg.lua.dist | |
| parent | a685dfb89e5c8895a767011961d2289810b72a1e (diff) | |
| parent | 15303b0d3a84572090e81dc7c737b575184135b6 (diff) | |
| download | prosody-fb0e709aa2d5fb52da6fb643a3cdfd921e8cde33.tar.gz prosody-fb0e709aa2d5fb52da6fb643a3cdfd921e8cde33.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions