diff options
author | Kim Alvefur <zash@zash.se> | 2015-10-17 19:30:58 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-10-17 19:30:58 +0200 |
commit | 275c4489cb615a8f0deafe128f51b95e960f7253 (patch) | |
tree | e42f73b91b33777c6f3dc6b22a59403c201c4289 /prosody.cfg.lua.dist | |
parent | 7835e7573e12cc36b70110705dd7b5571d26fbb9 (diff) | |
parent | b5541c402f33ec62d405594d306dba4d53363351 (diff) | |
download | prosody-275c4489cb615a8f0deafe128f51b95e960f7253.tar.gz prosody-275c4489cb615a8f0deafe128f51b95e960f7253.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions