From 5419ae93a1e1100800910cf551a6fa7d604e16f3 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 20 May 2018 14:56:03 +0200
Subject: [PATCH 1/3] regen credits

---
 util/credits.txt | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/util/credits.txt b/util/credits.txt
index e24f45f8a..ff2aa3575 100644
--- a/util/credits.txt
+++ b/util/credits.txt
@@ -1,8 +1,10 @@
 23n
 Abinoam P. Marques Jr.
 Abrax
+Adam Clark
 Adam Jurkiewicz
 Adam Magness
+AgnesElisa
 Albert
 Alberto Díaz Tormo
 Alex
@@ -10,6 +12,7 @@ Alexander Fortin
 Alexander Kampmann
 Alexandre Alapetite
 AlfredSK
+Andi
 Andi Stadler
 Andreas H.
 Andreas Neustifter
@@ -28,6 +31,8 @@ balderino
 Beanow
 beardyunixer
 Beatriz Vital
+Beluga
+Ben
 Ben Roberts
 ben-utzer
 bufalo1973
@@ -40,6 +45,7 @@ Christian González
 Christian M. Grube
 Christian Vogeley
 Cohan Robinson
+Copiis Praeesse
 Cyboulette
 Cyryl Sochacki
 czarnystokrotek
@@ -74,6 +80,7 @@ foss
 Francesco Apruzzese
 Frank Dieckmann
 Frederico Gonçalves Guimarães
+Friendica
 Gerhard Seeber
 gerhard6380
 Gert Cauwenberg
@@ -87,13 +94,16 @@ Hauke Altmann
 Hauke Zühl
 Herbert Thielen
 hoergen
+hoergen oostende
 Hubert Kościański
 Hypolite Petovan
+Ilmari
 irhen
 Jak
 Jakob
 Jens Tautenhahn
 jensp
+Jeroen De Meerleer
 jeroenpraat
 Johannes Schwab
 John Brazil
@@ -101,10 +111,13 @@ Jonatan Nyberg
 Josef Moravek
 juanman
 julia.domagalska
+Karel
 Karel Vandecandelaere
 Karolina
 Keith Fernie
 Klaus Weidenbach
+Koyu Berteon
+Kris
 Lea1995polish
 Leberwurscht
 Leonard Lausen
@@ -115,6 +128,7 @@ Magdalena Gazda
 Mai Anh Nguyen
 Manuel Pérez Monís
 Marcin Klessa
+Marcus Müller
 Mariusz Pisz
 marmor
 Marquis_de_Carabas
@@ -143,6 +157,7 @@ Paolo Wave
 Pavel Morozov
 Perig Gouanvic
 peturisfeld
+Philipp Holzer
 Pierre Rudloff
 Piotr Blonkowski
 pokerazor
@@ -162,6 +177,7 @@ Rui Andrada
 S.Krumbholz
 Sakałoŭ Alaksiej
 Sam
+Samuli Valavuo
 Sandro Santilli
 Sebastian Egbers
 sella
@@ -181,6 +197,7 @@ szymon.filip
 Sérgio Lima
 Taekus
 Tazman DeVille
+teho
 Thecross
 Thomas
 Thomas Willingham
@@ -198,10 +215,12 @@ Tubuntu
 Tupambae.org
 U-SOUND\mike
 ufic
+utzer
 Vasudev Kamath
 Vasya Novikov
 vislav
 Vít Šesták 'v6ak'
+Waldemar Stoczkowski
 Yasen Pramatarov
 ylms
 Zach Prezkuta
@@ -210,4 +229,5 @@ zotlabs
 zottel
 Zvi ben Yaakov (a.k.a rdc)
 Михаил
-朱陈锬
+Олексій Замковий
+朱陈锬
\ No newline at end of file

From 48aafe466234c7ccd8d3d2743a5306bc73e1e9e8 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 20 May 2018 14:56:33 +0200
Subject: [PATCH 2/3] fixing the base path detection

---
 bin/dev/make_credits.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/dev/make_credits.py b/bin/dev/make_credits.py
index fb13322b1..edd34c751 100755
--- a/bin/dev/make_credits.py
+++ b/bin/dev/make_credits.py
@@ -29,7 +29,7 @@ dontinclude = ['root', 'friendica', 'bavatar', 'tony baldwin', 'Taek', 'silke m'
 #  this script is in the /util sub-directory of the friendica installation
 #  so the friendica path is the 0th argument of calling this script but we
 #  need to remove the name of the file and the name of the directory
-path = os.path.abspath(argv[0].split('util/make_credits.py')[0])
+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'"]

From b6e02e2f0f326579fb4647365741f2739854f109 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 20 May 2018 15:02:44 +0200
Subject: [PATCH 3/3] cleanup

---
 util/credits.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/util/credits.txt b/util/credits.txt
index ff2aa3575..f88d1f793 100644
--- a/util/credits.txt
+++ b/util/credits.txt
@@ -80,7 +80,6 @@ foss
 Francesco Apruzzese
 Frank Dieckmann
 Frederico Gonçalves Guimarães
-Friendica
 Gerhard Seeber
 gerhard6380
 Gert Cauwenberg
@@ -94,7 +93,6 @@ Hauke Altmann
 Hauke Zühl
 Herbert Thielen
 hoergen
-hoergen oostende
 Hubert Kościański
 Hypolite Petovan
 Ilmari
@@ -215,7 +213,6 @@ Tubuntu
 Tupambae.org
 U-SOUND\mike
 ufic
-utzer
 Vasudev Kamath
 Vasya Novikov
 vislav
@@ -230,4 +227,4 @@ zottel
 Zvi ben Yaakov (a.k.a rdc)
 Михаил
 Олексій Замковий
-朱陈锬
\ No newline at end of file
+朱陈锬