diff options
author | Kim Alvefur <zash@zash.se> | 2018-06-22 14:18:36 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-06-22 14:18:36 +0200 |
commit | e9adc7247f7aa880b0793a153c998dec9ee99f37 (patch) | |
tree | 55445e82c4dcde919a836d2d40e78cc026d61b4a /prosody.cfg.lua.dist | |
parent | 9a0c8f33f975e9e3d92d2072b00da389bd2b16f3 (diff) | |
parent | be56bd2bd5fb2c2a21901d7cccdde0203c3f52bc (diff) | |
download | prosody-e9adc7247f7aa880b0793a153c998dec9ee99f37.tar.gz prosody-e9adc7247f7aa880b0793a153c998dec9ee99f37.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions