add contributing page

[irc/freenode/web-7.0.git] / README.md

diff --git a/README.md b/README.md
index 575bd1a5b51919c6f1955609669211231e1d5adc..994e53072d24b722b50eaf6babf3742d9f6dc745 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# web-7.0 [![Build Status](https://travis-ci.org/freenode/web-7.0.svg?branch=master)](https://travis-ci.org/freenode/web-7.0) [![irc: #freenode-website](https://img.shields.io/badge/irc-%23freenode--website-brightgreen.svg)](https://webchat.freenode.net/?channels=freenode-website)
+# web-7.0 [![Build Status](https://travis-ci.org/freenode/web-7.0.svg?branch=main)](https://travis-ci.org/freenode/web-7.0) [![irc: #freenode-website](https://img.shields.io/badge/irc-%23freenode--website-brightgreen.svg)](https://webchat.freenode.net/?channels=freenode-website)
 
 A shiny replacement for http://freenode.net.
 
@@ -33,7 +33,7 @@ from any directory, you can also use `cms7 -c /path/to/config.yml`.
 
 - Whenever possible, one commit per feature.
 - If feature/pull-request branches have only one developer, please regularly
-  rebase them onto master until they are merged in.
+  rebase them onto main until they are merged in.
 - Don't merge branches with meaningless commit messages; always squash them
   instead.
 - Wait for discussion of big changes. Your branches will still be here