diff options
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 -- |