fix merge conflict 0.7.x 0.8.x in util.php and register.php.

[quix0rs-gnu-social.git] / README

diff --git a/README b/README
index 29a1e157ad044730a2e5b674f1c41c4b4a2fa984..4f93829601e267c2a381cbdf6bc068008c295aea 100644 (file)
--- a/README
+++ b/README
@@ -1133,6 +1133,9 @@ welcome: nickname of a user account that sends welcome messages to new
          busy servers it may be a good idea to keep that one just for
          'urgent' messages. Default is null; no message.
 
+If either of these special user accounts are specified, the users should
+be created before the configuration is updated.
+
 Troubleshooting
 ===============