diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-26 22:22:43 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-26 22:22:43 +0100 |
| commit | b438e60d17b5103114ff9e187d171960d88259c9 (patch) | |
| tree | 1c5e65e70f484393b24c0bcd9ecd9f6c30d55922 /prosody.cfg.lua.dist | |
| parent | 383feaeddeb540024d5b06f97d402cef3061b7d5 (diff) | |
| parent | 4996a4724e87130c36f8d90b6cdf3628d39cebd8 (diff) | |
| download | prosody-b438e60d17b5103114ff9e187d171960d88259c9.tar.gz prosody-b438e60d17b5103114ff9e187d171960d88259c9.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions