diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-02-25 21:37:59 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-02-25 21:37:59 +0000 |
| commit | 9160b51d25d756102350b7b07ee77e41c8f52484 (patch) | |
| tree | 8ba043f6720a09bf1899d8570539113ffc52a902 | |
| parent | e224080a1416a55366b82243eb1fa92052f096fc (diff) | |
| parent | 29d4e6789526ce6edd26d26f12aef3388635cd36 (diff) | |
| download | prosody-9160b51d25d756102350b7b07ee77e41c8f52484.tar.gz prosody-9160b51d25d756102350b7b07ee77e41c8f52484.zip | |
Merge with 0.7
| -rw-r--r-- | prosody.cfg.lua.dist | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist index ab9df2b0..021f6f11 100644 --- a/prosody.cfg.lua.dist +++ b/prosody.cfg.lua.dist @@ -135,4 +135,4 @@ Host "example.com" --Component "conference.example.com" "muc" -- Set up a SOCKS5 bytestream proxy for server-proxied file transfers: ---Component "proxy.example.com "proxy65" +--Component "proxy.example.com" "proxy65" |