Merge pull request #9171 from tobiasd/2020.09-rc

added Roger Meyer to the credits

diff --git a/CREDITS.txt b/CREDITS.txt
index 402c356..1afbf16 100644 (file)
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -212,6 +212,7 @@ repat
 Ricardo Pereira
 Rik 4
 RJ Madsen
+Roger Meyer
 Roland Häder
 Rui Andrada
 rwa

diff --git a/bin/dev/make_credits.py b/bin/dev/make_credits.py
index d895213..be7a52e 100755 (executable)
--- a/bin/dev/make_credits.py
+++ b/bin/dev/make_credits.py
@@ -34,7 +34,7 @@ dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m'
 path = os.path.abspath(argv[0].split('bin/dev/make_credits.py')[0])
 print('> base directory is assumed to be: '+path)
 #  a place to store contributors
-contributors = ["Andi Stadler", "Ratten", "Vít Šesták 'v6ak'"]
+contributors = ["Andi Stadler", "Ratten", "Roger Meyer", "Vít Šesták 'v6ak'"]
 #  get the contributors
 print('> getting contributors to the friendica core repository')
 p = subprocess.Popen(['git', 'shortlog', '--no-merges', '-s'],