diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-10 10:06:20 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-10 10:06:20 -0700 |
| commit | 6a0f0e32d5e837c3f0f2041bc206fc35d69f497c (patch) | |
| tree | e9ce262b15006927ffc46c71a89ecb1a3ebfadbd /README | |
| parent | 03ccb74052ccec209adedfcd9daf4648905b322b (diff) | |
| parent | bafa1ab1c532118e2230df50ed18a1b4573692b7 (diff) | |
Merge branch '0.8.x' into 0.9.x
Diffstat (limited to 'README')
| -rw-r--r-- | README | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -953,12 +953,15 @@ sslserver: use an alternate server name for SSL URLs, like shorturllength: Length of URL at which URLs in a message exceeding 140 characters will be sent to the user's chosen shortening service. +<<<<<<< HEAD:README design: a default design (colors and background) for the site. Sub-items are: backgroundcolor, contentcolor, sidebarcolor, textcolor, linkcolor, backgroundimage, disposition. dupelimit: minimum time allowed for one person to say the same thing twice. Default 60s. Anything lower is considered a user or UI error. +======= +>>>>>>> 0.7.x:README db -- |