Updated README

a9b0db5d · Eric Duminil · 8988c746 · a9b0db5d
Commit a9b0db5d authored 4 years ago by Eric Duminil
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 2 deletions
+5 -2
--- 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/)