diff --git a/README.md b/README.md index b9d135d8fc9fe77b77b922f115e99bf92c586319..744c18fd15511019511627056c40b7f2b2ab7b31 100644 --- a/README.md +++ b/README.md @@ -77,10 +77,13 @@ make upload board=esp32 && make monitor # For ESP32 * Michael Käppler ## Contributing -Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change. + +* Merge requests are welcome, and should be based on the `develop` branch. +* The `develop` branch gets merged into the `master` once it has been sufficiently tested. +* For major changes, please open an issue first to discuss what you would like to change. ## License -Copyright © 2020, [HfT Stuttgart](https://www.hft-stuttgart.de/) +Copyright © 2021, [HfT Stuttgart](https://www.hft-stuttgart.de/) [GPLv3](https://choosealicense.com/licenses/gpl-3.0/)