diff options
author | Kim Alvefur <zash@zash.se> | 2015-05-19 23:23:44 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-05-19 23:23:44 +0200 |
commit | 516ca9ae842bae50588d38013d42ae5e23a4a39e (patch) | |
tree | 97a0b19f4d7e35f96455b0bd3b5c47457c88ff74 /prosody.cfg.lua.dist | |
parent | 25aa5f3bb97650283386799a4bf8b36012aeacdf (diff) | |
parent | c913917942ee16c0d4472d3ed344b506d1bfa50c (diff) | |
download | prosody-516ca9ae842bae50588d38013d42ae5e23a4a39e.tar.gz prosody-516ca9ae842bae50588d38013d42ae5e23a4a39e.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody.cfg.lua.dist')
0 files changed, 0 insertions, 0 deletions