Prepare for the merge of the histories

README.rst

@@ -17,12 +17,17 @@ Licence
 ::
 
   Copyright © 2019 Dominik George <dominik.george@teckids.org>
+  Copyright © 2020 Julian Leucker <leuckeju@katharineum.de>
+  Copyright © 2018, 2019 Frank Poetzsch-Heffter <p-h@katharineum.de>
   Copyright © 2019 Tom Teichler <tom.teichler@teckids.org>
+  Copyright © 2018, 2019, 2020 Jonathan Weth <wethjo@katharineum.de>
+  Copyright © 2019 Hangzhi Yu <yuha@katharineum.de>
 
-  Licensed under the EUPL
+  Licenced under the EUPL, version 1.2 or later
 
 Please see the LICENCE file accompanying this distribution for the
 full licence text or on the `Europen Union Public Licence`_ website
+https://joinup.ec.europa.eu/collection/eupl/guidelines-users-and-developers
 (including all other official language versions).
 
 .. _BiscuIT-ng: https://edugit.org/BiscuIT/BiscuIT-ng

pyproject.toml

@@ -7,7 +7,7 @@ packages = [
 readme = "README.rst"
 
 description = "BiscuIT School Information System (SIS) - App Chronos (Time tables)"
-authors = ["Dominik George <dominik.george@teckids.org>", "Tom Teichler <tom.teichler@teckids.org>"]
+authors = ["Dominik George <dominik.george@teckids.org>", "Julian Leucker <leuckeju@katharineum.de>", "Frank Poetzsch-Heffter <p-h@katharineum.de>", "Tom Teichler <tom.teichler@teckids.org>", "Jonathan Weth <wethjo@katharineum.de>", "Hangzhi Yu <yuha@katharineum.de>"]
 license = "EUPL-1.2"
 homepage = "https://biscuit.edugit.io/"
 repository = "https://edugit.org/BiscuIT/BiscuIT-App-Chronos"