From a9b0db5d7404ec480dd466f5411aebf727295ceb Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Fri, 23 Apr 2021 23:24:03 +0200
Subject: [PATCH] Updated README

---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b9d135d..744c18f 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/)
-- 
GitLab