Merge branch '0.7.x' into 0.8.x

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index 8622d3797060de38d6de606ef092bfa1f1cbcae0..40e5263550ef3c563c35566ae934e3c975b477b6 100644 (file)
--- a/README
+++ b/README
@@ -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
 --