diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-04-08 18:43:32 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-04-08 18:43:32 +0200 |
| commit | de8461e05948207352dd1bd53d82ff8ec9fc7658 (patch) | |
| tree | aaec68e6598ce8a78ee09ac575fdbaaeac033e7b | |
| parent | 60c183f10a1951b19ca6ac12c3259f4415916c7c (diff) | |
| parent | 7eb7f662b6c79f955acab6a9707ae4e04e427ceb (diff) | |
| download | etherpad-de8461e05948207352dd1bd53d82ff8ec9fc7658.tar.gz etherpad-de8461e05948207352dd1bd53d82ff8ec9fc7658.tar.bz2 etherpad-de8461e05948207352dd1bd53d82ff8ec9fc7658.zip | |
Merge branch 'master' of git://github.com/Pita/pad
| -rw-r--r-- | etherpad/etc/etherpad.localdev-default.properties | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties index 07dce96..98327fd 100644 --- a/etherpad/etc/etherpad.localdev-default.properties +++ b/etherpad/etc/etherpad.localdev-default.properties @@ -15,7 +15,7 @@ listen = 9000 logDir = ./data/logs modulePath = ./src motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0 -topdomains = localhost +topdomains = localhost,localbox.info transportPrefix = /comet transportUseWildcardSubdomains = true useHttpsUrls = false |