X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/68d3bccb32bfa6878c94c6011a3c5c53b60e2585..451d7720c831e134f2e860ddfe1138d1e92340ef:/README.md diff --git a/README.md b/README.md index ec6926efc..994e53072 100644 --- 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) +# 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. @@ -8,7 +8,7 @@ A shiny replacement for http://freenode.net. You'll need our node.js dependencies: ```console -$ sudo npm install -g postcss-cli svgo +$ sudo npm install -g postcss-cli@7.1.2 svgo uglifyjs $ npm install ``` @@ -33,12 +33,14 @@ 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 tomorrow. +Please comply with the [contribution guidelines](CONTRIBUTING.md) + Helpful tip for those merging PRs: you can browse the tree a merge would result in by navigating to `https://github.com/freenode/web-7.0/tree/pull/XYZ/merge`, where `XYZ` is the